Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:44 +0000 (10:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:36:44 +0000 (10:36 -0400)

Trivial merge