Fetch upstream and Merge branch 'master' into enh/NormalizeMapsAlgorithm

Conflicts:
	CHANGES
Merge branch 'enh/NormalizeMapsAlgorithm' into experimental

Conflicts:
	CHANGES