Allow special characters in map names
Merge branch 'map-names' into gh-pages