Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index 0c6d4094ed7eaadd78d42b7898e33793d7e72450,d6f7d2cb94d5abcd32ef4d59672f4ce1230981cb..7c5763fd47b678f03f7ac7f998c04c6b394c8023
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -103,17 -103,8 +103,16 @@@ set(CUSTOMFILE
      website/reverse.php
      website/search.php
      website/status.php
 +    website/403.html
 +    website/509.html
 +    website/crossdomain.xml
 +    website/favicon.ico
 +    website/last_update.php
 +    website/nominatim.xml
 +    website/robots.txt
 +    website/taginfo.json
      utils/blocks.php
      utils/country_languages.php
-     utils/imports.php
      utils/importWikipedia.php
      utils/export.php
      utils/query.php

diff --cc lib/Geocode.php
Simple merge

diff --cc lib/lib.php
Simple merge

diff --cc website/reverse.php
Simple merge