Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Sep 2019 12:43:32 +0000 (08:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Sep 2019 12:43:32 +0000 (08:43 -0400)

Trivial merge