Postmerge mapfixes again.
Merge pull request #3525 from Segrain/master

Postmerge mapfixes.