Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index d532bf55d7bec51e59790ed52c08f4d9dd0229e6,4e55a8a543e864ee6d8a4a1796913fb88383f88d..3f06d842b44a67fd15130f67e906e53e27dec8ec
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -93,18 -93,11 +93,19 @@@ 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
      utils/server_compare.php
      utils/setup.php