Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 18:01:37 +0000 (13:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 18:01:37 +0000 (13:01 -0500)

Trivial merge