Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Sep 2018 13:27:44 +0000 (09:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Sep 2018 13:27:44 +0000 (09:27 -0400)

Trivial merge