Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 21 Jun 2018 16:51:44 +0000 (12:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 21 Jun 2018 16:51:44 +0000 (12:51 -0400)

Trivial merge