Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:07 +0000 (14:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:07 +0000 (14:09 -0400)

Trivial merge