Reoder ChangeLog items by Issue number
Merge branch 'master' into #331

Conflicts:
	CHANGELOG.md