Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 May 2018 19:05:41 +0000 (15:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 May 2018 19:05:41 +0000 (15:05 -0400)

Trivial merge