master branch leaflet changes