Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 4 May 2018 16:57:06 +0000 (12:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 4 May 2018 16:57:06 +0000 (12:57 -0400)

Trivial merge