Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:00 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:00 +0000 (08:48 -0400)

Trivial merge