Merge branch 'hotfix/1.2.35' v1.2.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 16:06:11 +0000 (11:06 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 16:06:11 +0000 (11:06 -0500)

Trivial merge