Fix busted changelog indent
Merge branch '1.13' into 1.14
Merge branch '1.14' into 1.15

Conflicts:
	sites/www/changelog.rst