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)
commitc4d0062ce3694e3dd55bcd95b368a272728dd52e
treee554fab4f11e2769cb6e7ba7b5f909894fd7e78e
parent99a5895af6a16fceb0804a62732eec7f76975ecc
parent0ef538526d69ccd198be700e6bfa5f7f7a41b789
Merge branch 'hotfix/1.1.36'