Merge pull request #3428 from Segrain/master

Postmerge mapfix.
Fix for #3430.