Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 20:15:25 +0000 (16:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 May 2018 20:15:25 +0000 (16:15 -0400)

Trivial merge