Merge branch 'release/1.0.17' master v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Sep 2019 19:52:38 +0000 (15:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Sep 2019 19:52:38 +0000 (15:52 -0400)

Trivial merge