Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 14:48:55 +0000 (09:48 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 14:48:55 +0000 (09:48 -0500)

Trivial merge