Merge branch 'hotfix/1.0.6' master v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 14:48:13 +0000 (10:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 14:48:13 +0000 (10:48 -0400)

Trivial merge