Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Aug 2018 15:35:44 +0000 (11:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Aug 2018 15:35:44 +0000 (11:35 -0400)

Trivial merge