Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 24 Aug 2018 20:11:06 +0000 (16:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 24 Aug 2018 20:11:06 +0000 (16:11 -0400)

Trivial merge