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

Trivial merge