Merge branch 'hotfix/1.1.35' v1.1.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 13:20:51 +0000 (09:20 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 13:20:51 +0000 (09:20 -0400)

Trivial merge