Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index fcc7075ab5cd3c36056433bfd2ea7635d0c0b765,d0b72a48ced9f9050e25ebad024218109e2350f5..a50347863700054551a179a15502908d6b9a38da
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -107,19 -107,9 +107,19 @@@ set(WEBSITESCRIPT
      website/status.php
  )
  
 +set(WEBSITEFILES
 +    403.html
 +    509.html
 +    crossdomain.xml
 +    favicon.ico
 +    nominatim.xml
 +    robots.txt
 +    taginfo.json
 +)
 +
  set(CUSTOMSCRIPTS
+     utils/check_import_finished.php
      utils/country_languages.php
-     utils/importWikipedia.php
      utils/export.php
      utils/query.php
      utils/setup.php
@@@ -138,11 -128,6 +138,11 @@@ foreach (script_source ${WEBSITESCRIPTS
                     ${PROJECT_BINARY_DIR}/${script_source})
  endforeach()
  
 +foreach (webfile ${WEBSITEFILES})
 +    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                   ${PROJECT_BINARY_DIR}/website/${webfile})
 +endforeach()
 +
  configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
                 ${PROJECT_BINARY_DIR}/settings/settings.php)