Update change log
Merge branch 'master' into 1.9.x-stable

Conflicts:
	ChangeLog.md