Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jul 2018 20:50:47 +0000 (16:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jul 2018 20:50:47 +0000 (16:50 -0400)

Trivial merge