Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Jul 2019 20:41:38 +0000 (16:41 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Jul 2019 20:41:38 +0000 (16:41 -0400)

Trivial merge