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

diff --combined config/key.yml
index 10789311a9a2bd8fb0cd4a949c9f6c4c3ff2484e,b93096c091de188506efa77a7b06442354fb74cb..c85ec0d4a1e80ffdcf5708937d957b0300080a1a
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -15,17 -15,17 +15,17 @@@ mapnik
    - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
    - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
    - { min_zoom: 0, max_zoom: 19, name: admin, image: admin.png }
-   - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png }
-   - { min_zoom: 10, max_zoom: 19, name: wood, image: wood.png }
+   - { min_zoom: 5, max_zoom: 19, name: forest, image: forest.png }
+   - { min_zoom: 5, max_zoom: 19, name: wood, image: wood.png }
    - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
    - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
    - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
-   - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
+   - { min_zoom: 5, max_zoom: 19, name: common, image: common.png }
    - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
    - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
    - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
    - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
 -  - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png }
 +  - { min_zoom: 0, max_zoom: 19, name: lake, image: lake.png }
    - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
    - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
    - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }