Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 9 Mar 2018 19:45:55 +0000 (14:45 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 9 Mar 2018 19:45:55 +0000 (14:45 -0500)

Trivial merge