Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jan 2018 18:32:53 +0000 (13:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 30 Jan 2018 18:32:53 +0000 (13:32 -0500)

Trivial merge