Merge branch 'hotfix/1.0.4'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:13 +0000 (14:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:13 +0000 (14:00 -0500)

Trivial merge