Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 9 Oct 2018 16:53:52 +0000 (12:53 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 9 Oct 2018 16:53:52 +0000 (12:53 -0400)

Trivial merge