Merge branch 'hotfix/1.0.35' v1.0.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 Oct 2018 15:37:56 +0000 (11:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 Oct 2018 15:37:56 +0000 (11:37 -0400)

Trivial merge