Merge branch 'hotfix/1.0.1'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 17:59:55 +0000 (12:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 17:59:55 +0000 (12:59 -0500)

Trivial merge