Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 2 Apr 2018 20:05:00 +0000 (16:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 2 Apr 2018 20:05:00 +0000 (16:05 -0400)

Trivial merge