Openstreetmap

Merge OpenStreetMap back into master to check on testing sometime.