Update Mazemap:master from Leaflet:master

Import latest fixes