Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 19:25:05 +0000 (15:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 19:25:05 +0000 (15:25 -0400)

Trivial merge