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

Implements #719