Merge branch 'hotfix/1.0.37' v1.0.37
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Oct 2018 15:23:12 +0000 (11:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Oct 2018 15:23:12 +0000 (11:23 -0400)

Trivial merge