Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Apr 2016 21:46:49 +0000 (17:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Apr 2016 21:46:49 +0000 (17:46 -0400)

Trivial merge