Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 30 Aug 2017 19:08:39 +0000 (15:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 30 Aug 2017 19:08:39 +0000 (15:08 -0400)

Trivial merge