Merge branch 'hotfix/1.0.35' v1.0.35
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Sep 2018 16:13:00 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Sep 2018 16:13:00 +0000 (12:13 -0400)

Trivial merge