Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:30:59 +0000 (17:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:30:59 +0000 (17:30 -0400)

Trivial merge