Merge remote-tracking branch 'origin/master'

Author: Nicolò Maria Mezzopera

docs/components/l-control-scale/README.md

@@ -11,7 +11,7 @@ Any of the props of `l-control-scale` or the classes that it extends can be used
 
 <template>
   <l-map style="height: 100%; width: 100%" :zoom="zoom" :center="center">
-    <l-control-scale position="topright" scale="imperial" ></l-control-scale>
+    <l-control-scale position="topright" :imperial="true" :metric="false"></l-control-scale>
     <l-tile-layer :url="url"></l-tile-layer>
   </l-map>
 </template>