Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:20:07 +0000 (18:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jan 2018 23:20:07 +0000 (18:20 -0500)

Trivial merge