Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:31:46 +0000 (15:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:31:46 +0000 (15:31 -0400)

Trivial merge