v2.36.0
Merge pull request #742 from rwdaigle/v2.36.0

v2.36.0 (heroku fork)