Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 10 Sep 2018 20:43:44 +0000 (16:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 10 Sep 2018 20:43:44 +0000 (16:43 -0400)

Trivial merge