Update change log

Conflicts:
	CHANGELOG.txt.gz
Merge pull request #1029 from emmanuel-keller/1.6

Update change log