Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Aug 2018 15:57:14 +0000 (11:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Aug 2018 15:57:14 +0000 (11:57 -0400)

Trivial merge