Merge branch 'hotfix/1.0.36' v1.0.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 24 Jan 2019 21:37:21 +0000 (16:37 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 24 Jan 2019 21:37:21 +0000 (16:37 -0500)

Trivial merge