Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 11 Jul 2018 21:13:32 +0000 (17:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 11 Jul 2018 21:13:32 +0000 (17:13 -0400)

Trivial merge