Merge branch 'leaflet'