Changelog for 1.11.5
Merge branch '1.11' into 1.12

Conflicts:
	sites/www/changelog.rst
Changelog for 1.12.3