Merge branch 'hotfix/1.1.36' v1.1.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 13:28:47 +0000 (09:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 13:28:47 +0000 (09:28 -0400)

Trivial merge