Merge from Leaflet/master