* Ready to produce \"original\" release 2.36
Merge branch 'release-2.36'