Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 18:52:41 +0000 (14:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 18:52:41 +0000 (14:52 -0400)

Trivial merge