Get the OSM attribution correct
Merge branch 'master' into wikimaps_new