Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Jul 2018 16:26:38 +0000 (12:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Jul 2018 16:26:38 +0000 (12:26 -0400)

Trivial merge