Merge branch 'master' of https://github.com/openmaptiles/openmaptiles into merge-github

# Conflicts:
#	Makefile
#	QUICKSTART.md
#	docker-compose.yml
#	layers/boundary/mapping.yaml
#	layers/landuse/landuse.sql
#	layers/landuse/landuse.yaml
#	layers/landuse/mapping.yaml
#	layers/poi/mapping.yaml
#	layers/poi/poi.sql
#	layers/poi/poi.yaml

openmaptiles.yaml

@@ -19,7 +19,7 @@ tileset:
     - layers/landmarks/landmark.yaml
     - layers/aerodrome_label/aerodrome_label.yaml
   name: OpenMapTiles
-  version: 3.12.1
+  version: 3.14.0
   id: openmaptiles
   description: "A tileset showcasing all layers in OpenMapTiles. https://openmaptiles.org"
   attribution: '<a href="https://www.openmaptiles.org/" target="_blank">&copy; OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>'
@@ -34,6 +34,7 @@ tileset:
     - az # Azerbaijani, Latin
     - be # Belorussian
     - bg # Bulgarian
+    - bn # Bengali
     - br # Breton, Latin
     - bs # Bosnian, Latin
     - ca # Catalan, Latin
@@ -48,6 +49,7 @@ tileset:
     - es # Spanish, Latin
     - et # Estonian, Latin
     - eu # Basque, Latin
+    - fa # Persian
     - fi # Finnish, Latin
     - fr # French, Latin
     - fy # Western Frisian, Latin
@@ -82,6 +84,8 @@ tileset:
     - nl # Dutch, Latin
     - "no" # Norwegian, Latin
     - oc # Occitan (post 1500), Latin
+    - pa # Punjabi
+    - pnb # Western Punjabi
     - pl # Polish, Latin
     - pt # Portuguese, Latin
     - rm # Romansh, Latin
@@ -98,7 +102,11 @@ tileset:
     - th # Thai
     - tr # Turkish, Latin
     - uk # Ukrainian
+    - ur # Urdu
+    - vi # Vietnamese, Latin
     - zh # Chinese
+    - zh-Hant # Traditional Chinese
+    - zh-Hans # Simplified Chinese
   defaults:
     srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
     datasource: