Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 19:03:51 +0000 (15:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 19:03:51 +0000 (15:03 -0400)

Trivial merge