Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 16:44:50 +0000 (11:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 16:44:50 +0000 (11:44 -0500)

Trivial merge