Version bump to 2.3.6
Publish 2.3.6 Changelog
Version bump to 2.3.7 (for development)