Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:19 +0000 (14:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jun 2015 18:56:19 +0000 (14:56 -0400)

Trivial merge