Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 17:43:59 +0000 (13:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 17:43:59 +0000 (13:43 -0400)

Trivial merge