Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index d8d3efd98e1ecce4f8d041bd2c41865926efc226,3086a70b51933a5f08edefa7c7950f29ae748193..7cf96d90330d3e125825c4659802f81b99ff85f2
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -48,7 -48,6 +48,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -64,7 -63,7 +64,7 @@@ if ($iCacheMemory + 500 > getTotalMemor
      $iCacheMemory = getCacheMemoryMB();
      echo "WARNING: resetting cache memory to $iCacheMemory\n";
  }
- $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+ $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -S '.CONST_Import_Style.' -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
  if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
      $sOsm2pgsqlCmd .= ' -U ' . $aDSNInfo['username'];
  }