Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:33:35 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 16 Aug 2017 20:33:35 +0000 (16:33 -0400)

Trivial merge