Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Apr 2019 12:48:45 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Apr 2019 12:48:45 +0000 (08:48 -0400)

Trivial merge