Update Changelog
Bump version for release 2.3.6
Add .pre for next release