Merge branch 'hotfix/1.0.36' v1.0.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 Oct 2018 20:31:26 +0000 (16:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 26 Oct 2018 20:31:26 +0000 (16:31 -0400)

Trivial merge