Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:40:19 +0000 (12:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:40:19 +0000 (12:40 -0400)

Trivial merge