Merge branch 'hotfix/1.2.36' v1.2.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:44:41 +0000 (15:44 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:44:41 +0000 (15:44 -0500)

Trivial merge