Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Mar 2019 16:11:52 +0000 (12:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Mar 2019 16:11:52 +0000 (12:11 -0400)

Trivial merge