Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 48d640bca505a5058e9facb10107ae7b5337cb03,976f0698901aed5c9b0d2242ed64e440bbde4dca..e189e479af7c5fb2525d6caf0aba1585d7005891
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -62,7 -62,7 +62,7 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_IMPORTER)
-     find_package(PythonInterp 3.5 REQUIRED)
+     find_package(PythonInterp 3.6 REQUIRED)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -113,27 -113,6 +113,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------