Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index c8a5752178cbdba0dd03e4d1d7f7c0053bb1270d,8200e7572beb9548ee78f412e1e2146ee80347e0..3f68012f08715b6a6261a034e22f6befd295ed0d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -73,7 -73,7 +73,7 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_IMPORTER)
-     find_package(PythonInterp 3.6 REQUIRED)
+     find_package(PythonInterp 3.7 REQUIRED)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -124,27 -124,6 +124,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
  #-----------------------------------------------------------------------------