Sync with upstream Leaflet 0.2 branch