Don't preseed releases, ugh
Merge branch '1.10' into 1.11

Conflicts:
	sites/www/changelog.rst
Merge branch '1.11' into 1.12

Conflicts:
	sites/www/changelog.rst