Implements #719
Conflicts:
	CHANGELOG.txt.gz
Merge pull request #809 from emmanuel-keller/master

Implements #719