Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index e9731ba866a46f0febaba3442428df873461eefd,f5f776a171a0ddf9d6d8d6fcd9ed99a16cee7da9..bdc5cfdcf51e20885ccc6ce1d3781bda8940b7f9
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -63,7 -63,6 +63,6 @@@ if (BUILD_IMPORTER AND BUILD_OSM2PGSQL
      endif()
      set(BUILD_TESTS_SAVED "${BUILD_TESTS}")
      set(BUILD_TESTS off)
-     set(WITH_LUA off CACHE BOOL "")
      add_subdirectory(osm2pgsql)
      set(BUILD_TESTS ${BUILD_TESTS_SAVED})
  endif()
@@@ -125,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
  #-----------------------------------------------------------------------------