Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 22 Aug 2019 16:36:07 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 22 Aug 2019 16:36:07 +0000 (12:36 -0400)

Trivial merge