Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Aug 2018 19:44:17 +0000 (15:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Aug 2018 19:44:17 +0000 (15:44 -0400)

Trivial merge