Avoid 301 redirect & resultant extra web request
Merge branch 'dev'

Conflicts:
	docs/changelog.rst