Implements #719

Conflicts:
	CHANGELOG.txt.gz