Merge from Leaflet/master

Update to latest