Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:17 +0000 (11:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:17 +0000 (11:53 -0400)

Trivial merge