Merge branch 'release/1.0.17' master v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Jan 2019 14:35:44 +0000 (09:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Jan 2019 14:35:44 +0000 (09:35 -0500)

Trivial merge