Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 15:38:58 +0000 (11:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 15:38:58 +0000 (11:38 -0400)

Trivial merge