Merge remote-tracking branch 'upstream/pull/3318'

diff --combined config/locales/en.yml
index 030fab696e65e9eb6b392a2db73f87a1ac732645,93bafb7ed218f99e57c342da72d8f54ba598bba1..c01a66b2c03e39affefa386c283464950bc374d6
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -747,6 -747,7 +747,7 @@@ en
            window_construction: "Window Construction"
            winery: "Winery"
            "yes": "Craft Shop"
+         crossing: "Crossing"
          emergency:
            access_point: "Access Point"
            ambulance_station: "Ambulance Station"
@@@ -1002,6 -1003,7 +1003,7 @@@
            hill: "Hill"
            hot_spring: "Hot Spring"
            island: "Island"
+           isthmus: "Isthmus"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
@@@ -1016,10 -1018,13 +1018,13 @@@
            sand: "Sand"
            scree: "Scree"
            scrub: "Scrub"
+           shingle: "Shingle"
            spring: "Spring"
            stone: "Stone"
            strait: "Strait"
            tree: "Tree"
+           tree_row: "Tree Row"
+           tundra: "Tundra"
            valley: "Valley"
            volcano: "Volcano"
            water: "Water"
@@@ -1420,9 -1425,8 +1425,9 @@@
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
 -    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
 +    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
      partners_ucl: "UCL"
 +    partners_fastly: "Fastly"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
      tou: "Terms of Use"