Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:22:24 +0000 (16:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:22:24 +0000 (16:22 -0400)

Trivial merge