Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/update.php

diff --cc lib/Geocode.php
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc utils/update.php
index febe06820bceb39cd2846d3df8ae6939b6622a79,93b5ab0919db374dab7da461f830c19d451985bc..d3c2bc73c89836bd2b778e1cfe20a9544879bf06
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -46,7 -47,9 +47,8 @@@
                showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
        }
  
 -      if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
+ 
  /*
        // Lock to prevent multiple copies running
        if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
@@@ -362,12 -370,8 +370,8 @@@
                $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;
-               if (!is_null(CONST_Osm2pgsql_Flatnode_File))
-               {
-                       $sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
-               }
+               $sCMDImport = $sOsm2pgsqlCmd.' '.$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 ';
                }