Leaflet 0.7 upgrade