Fix map ordering
Merge branch 'master' into wmplus