Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Nov 2017 15:15:27 +0000 (10:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Nov 2017 15:15:27 +0000 (10:15 -0500)

Trivial merge