Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:35:27 +0000 (15:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 19:35:27 +0000 (15:35 -0400)

Trivial merge