Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index d91c8a7685e77e1e2b3d54ad3a6b459248b0bcc7,c1dc2ab938c33886cf5cb8be6cd39b1b2c857e54..2fa773fe3dbbb46d53cb0ccb58cc4dfb50e6384b
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -49,7 -49,6 +49,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');
@@@ -83,6 -82,12 +83,12 @@@ if (!is_null(CONST_Osm2pgsql_Flatnode_F
  }
  
  $sIndexCmd = CONST_BasePath.'/nominatim/nominatim.py';
+ if (!$aResult['quiet']) {
+     $sIndexCmd .= ' -v';
+ }
+ if ($aResult['verbose']) {
+     $sIndexCmd .= ' -v';
+ }
  
  if ($aResult['init-updates']) {
      // sanity check that the replication URL is correct