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

diff --combined config/key.yml
index 0ff7ede3306e169ee5834f66fa6246f0f158315e,877f853ef47f529b5fc0431f5b0eb2417e2e1d22..05805707980728fe62f420790377309a082acb48
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -20,10 -20,7 +20,10 @@@ mapnik
    - { min_zoom: 15, name: tram_only, image: tram15.svg }
    - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
    - { min_zoom: 12, name: cable, image: cable.png }
 -  - { min_zoom: 11, name: runway, image: runway.png }
 +  - { min_zoom: 11, name: runway, image: runway11.svg }
 +  - { min_zoom: 12, name: runway, image: runway12.svg }
 +  - { min_zoom: 13, name: runway, image: runway13.svg }
 +  - { min_zoom: 14, name: runway, image: runway14.svg }
    - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
    # administrative boundaries: admin.mss
    - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
@@@ -108,9 -105,9 +108,9 @@@ cyclemap
    - { min_zoom: 13, name: footway, image: footway.svg }
    - { min_zoom:  7, name: rail, image: rail.png }
    - { min_zoom: 14, name: rail, image: rail14.png }
-   - { min_zoom:  9, name: forest, width: 26, height: 10, fill: "#cde1c4" }
-   - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#bcdd92" }
-   - { min_zoom:  7, name: lake, width: 26, height: 10, fill: "#b5d0d0" }
+   - { min_zoom:  9, name: forest, width: 26, height: 10, fill: "#b3d6a4" }
+   - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#c0de9c" }
+   - { min_zoom:  1, name: lake, width: 26, height: 10, fill: "#addeff" }
    - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
    - { min_zoom: 14, name: bicycle_parking, image: bicycle_parking.png }
    - { min_zoom: 16, name: toilets, image: toilets.png }