Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 18:25:18 +0000 (14:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 18:25:18 +0000 (14:25 -0400)

Trivial merge