Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 10 Aug 2017 20:19:11 +0000 (16:19 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 10 Aug 2017 20:19:11 +0000 (16:19 -0400)

Trivial merge