Merge branch 'hotfix/1.0.19' v1.0.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 22:05:54 +0000 (17:05 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 22:05:54 +0000 (17:05 -0500)

Trivial merge