Update change log
Conflicts:
	CHANGELOG.txt.gz
Merge pull request #847 from emmanuel-keller/1.6

Update change log