Merge branch 'hotfix/1.0.19' v1.0.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:50:54 +0000 (10:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:50:54 +0000 (10:50 -0400)

Trivial merge