Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index b8a6a2e4f879e78a07f51a5d252b933ea697322e,38551da75a5586b58daf6f7987c7c540d89b2361..48d640bca505a5058e9facb10107ae7b5337cb03
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -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
  #-----------------------------------------------------------------------------
@@@ -279,5 -258,6 +279,6 @@@ install(FILES settings/env.default
                settings/import-address.style
                settings/import-full.style
                settings/import-extratags.style
-               settings/legacy_icu_tokenizer.json
+               settings/legacy_icu_tokenizer.yaml
+               settings/icu-rules/extended-unicode-to-asccii.yaml
          DESTINATION ${NOMINATIM_CONFIGDIR})