Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:44:47 +0000 (15:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:44:47 +0000 (15:44 -0400)

Trivial merge