Update Geomap branch with master

Should make the diff view easier for #1539