Merge branch 'master' of https://github.com/willtemperley/v-leaflet
Merge branch 'master' of https://github.com/willtemperley/v-leaflet