Merge branch 'hotfix/1.0.35' v1.0.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Mar 2018 16:42:31 +0000 (12:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Mar 2018 16:42:31 +0000 (12:42 -0400)

Trivial merge