Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 28 Aug 2018 14:10:30 +0000 (10:10 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 28 Aug 2018 14:10:30 +0000 (10:10 -0400)

Trivial merge