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

diff --combined config/key.yml
index 1bc81f7408c21485ba8bfb094e54402a619a456e,b77f5c6250ca9d074f8d1d233093c40fd17dba41..0737c9b9d2ab02ae2e091528c7af30ad2c2e7930
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -8,8 -8,8 +8,8 @@@ mapnik
    - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
    - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
    - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
 -  - { min_zoom: 8, max_zoom: 12, name: rail, image: rail.png }
 -  - { min_zoom: 13, max_zoom: 19, name: rail, image: rail13.png }
 +  - { min_zoom: 8, max_zoom: 11, name: rail, image: rail.png }
 +  - { min_zoom: 12, max_zoom: 19, name: rail, image: rail12.png }
    - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png }
    - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png }
    - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
@@@ -38,7 -38,7 +38,7 @@@
    - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
    - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
    - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
-   - { min_zoom: 12, max_zoom: 19, name: summit, image: summit.png }
+   - { min_zoom: 11, max_zoom: 19, name: summit, image: summit.png }
    - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
    - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
    - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }