Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:36 +0000 (14:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 18:51:36 +0000 (14:51 -0400)

Trivial merge