Merge remote-tracking branch 'upstream/master'

diff --cc settings/settings.php
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc utils/update.php
index 0918730d01fb9e2783cab9baf90174d0e94e79e7,76d6f8582c2e1e9646845890b1d451b5ff8c6527..e8972f1d26f4d3cefa962667459966d38f548050
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -353,8 -353,9 +353,9 @@@
                $sOsmosisCMD = CONST_Osmosis_Binary;
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
+               $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sImportFile;
 -              $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
 +              $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }

diff --cc website/search.php
Simple merge