Merge branch 'hotfix/1.0.1' master v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 20:04:07 +0000 (16:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 20:04:07 +0000 (16:04 -0400)

Trivial merge