Merge branch 'hotfix/1.0.4'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:24:55 +0000 (14:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 19:24:55 +0000 (14:24 -0500)

Trivial merge