map-mod fun
Update Changelog
(resync from RC2)

(cherry picked from commit 64e8f0e1461be2c41d6020ebbeaacf3ee191d71f)

Conflicts:
	ChangeLog