Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
Simple merge

diff --cc lib-php/admin/update.php
Simple merge

diff --cc lib-php/website/403.html
index 8d8e3233b53bda92e9f3ba20058e5c6c23f2faeb,0000000000000000000000000000000000000000..8d8e3233b53bda92e9f3ba20058e5c6c23f2faeb
mode 100644,000000..100644
--- 1/website/403.html
--- /dev/null
+++ b/lib-php/website/403.html

diff --cc lib-php/website/509.html
index 628c53bdfe8532ea595ff2f254b0e4f8873399ba,0000000000000000000000000000000000000000..628c53bdfe8532ea595ff2f254b0e4f8873399ba
mode 100644,000000..100644
--- 1/website/509.html
--- /dev/null
+++ b/lib-php/website/509.html

diff --cc lib-php/website/crossdomain.xml
index 963a682b6d32202a183c39f9e58cbf412b3b3f0c,0000000000000000000000000000000000000000..963a682b6d32202a183c39f9e58cbf412b3b3f0c
mode 100644,000000..100644
--- 1/website/crossdomain.xml
--- /dev/null
+++ b/lib-php/website/crossdomain.xml

diff --cc lib-php/website/favicon.ico
index 0157ea008fd941f507323a72a108baaa3b72d06f,0000000000000000000000000000000000000000..0157ea008fd941f507323a72a108baaa3b72d06f
mode 100644,000000..100644
Binary files differ

diff --cc lib-php/website/nominatim.xml
index 28684b169970cea1d78bb4d2f07b9caf5df27337,0000000000000000000000000000000000000000..28684b169970cea1d78bb4d2f07b9caf5df27337
mode 100644,000000..100644
--- 1/website/nominatim.xml
--- /dev/null
+++ b/lib-php/website/nominatim.xml

diff --cc lib-php/website/robots.txt
index 9624d97ce0424891c17a5457738ea778c10ce4ab,0000000000000000000000000000000000000000..9624d97ce0424891c17a5457738ea778c10ce4ab
mode 100644,000000..100644
--- 1/website/robots.txt
--- /dev/null
+++ b/lib-php/website/robots.txt

diff --cc lib-php/website/taginfo.json
index 98f8b978a7031672e5745247ef3c49a72ee5110b,0000000000000000000000000000000000000000..98f8b978a7031672e5745247ef3c49a72ee5110b
mode 100644,000000..100644
--- 1/website/taginfo.json
--- /dev/null
+++ b/lib-php/website/taginfo.json

diff --cc lib-sql/functions/address_lookup.sql
Simple merge