Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Dec 2017 21:47:44 +0000 (16:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Dec 2017 21:47:44 +0000 (16:47 -0500)

Trivial merge