Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:48:23 +0000 (15:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:48:23 +0000 (15:48 -0400)

Trivial merge