Merge tag 'v1.0.18' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 15:25:57 +0000 (10:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 15:25:57 +0000 (10:25 -0500)
v1.0.18 release


Trivial merge