Merge branch 'leafletjs'