Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 23 May 2018 20:26:21 +0000 (16:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 23 May 2018 20:26:21 +0000 (16:26 -0400)

Trivial merge