Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Mar 2018 13:31:30 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Mar 2018 13:31:30 +0000 (09:31 -0400)

Trivial merge