Put CHANGELOG in order by issue number.
Merge branch 'master' into #439

Conflicts:
	CHANGELOG.md