Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 14:29:05 +0000 (10:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 14:29:05 +0000 (10:29 -0400)

Trivial merge