Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:10 +0000 (17:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:10 +0000 (17:14 -0500)

Trivial merge