Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:06:18 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:06:18 +0000 (14:06 -0400)

Trivial merge