Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 22 Aug 2018 20:16:56 +0000 (16:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 22 Aug 2018 20:16:56 +0000 (16:16 -0400)

Trivial merge