Merge remote-tracking branch 'upstream/master'

diff --cc lib/template/includes/introduction.php
index f089881faac81594961b933561ef6fda99ce5e03,f891c7853b01c58fa7f9478ebc3a61f2815bac7b..ce136d2d950188f8291267545a7628ba2e0a0cfe
--- 1/lib/template/includes/introduction.php
--- 2/lib/template/includes/introduction.php
+++ b/lib/template/includes/introduction.php
@@@ -6,6 -6,4 +6,6 @@@ look up data by its geographic coordina
  link to a details page where you can inspect what data about the object is saved in 
  the database and investigate how the address of the object has been computed.</p>
  
- <p>For more information visit the <a href="https://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.</p>
 -For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.
++<p>For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.</p>
 +
 +<p>All usage of nominatim.openstreetmap.org must follow the <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.</p>