Use rst instead of markdown syntax in CHANGELOG to match README.
Merge branch 'master' into next

Conflicts:
	CHANGELOG.rst