Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Jul 2019 20:50:00 +0000 (16:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Jul 2019 20:50:00 +0000 (16:50 -0400)

Trivial merge