Disable mouse wheel events in Leaflet controls
Merge remote-tracking branch 'upstream/master'
Fix less indentation