Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:53:11 +0000 (12:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 23 Aug 2018 16:53:11 +0000 (12:53 -0400)

Trivial merge