Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Nov 2018 14:37:50 +0000 (10:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Nov 2018 14:37:50 +0000 (10:37 -0400)

Trivial merge