Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:25 +0000 (09:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:25 +0000 (09:45 -0400)

Trivial merge