Merge remote-tracking branch 'openstreetmap/pull/1030' into next

diff --cc Vendorfile
index 361f2c84361173bc6948a7c3e661a6a10e44bc8b,6826e8e16a175fd29d16272bab139c13e957d420..93ad74c7bc43101142722791f27b18863da8baae
--- 1/Vendorfile
--- 2/Vendorfile
+++ b/Vendorfile
@@@ -17,9 -17,14 +17,14 @@@ folder 'vendor/assets' d
      [ 'layers.png', 'layers-2x.png',
        'marker-icon.png', 'marker-icon-2x.png',
        'marker-shadow.png' ].each do |image|
 -      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.3/images/#{image}"
 +      file "images/#{image}", "https://unpkg.com/leaflet@1.0.3/dist/images/#{image}"
      end
  
+     from 'git://github.com/aratcliffe/Leaflet.contextmenu.git' do
+       file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js'
+       file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css'
+     end
+ 
      from 'git://github.com/kajic/leaflet-locationfilter.git' do
        file 'leaflet.locationfilter.css', 'src/locationfilter.css'
        file 'leaflet.locationfilter.js', 'src/locationfilter.js'

diff --cc app/assets/javascripts/index.js
Simple merge