Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index 87a5a294221e5fed07f83e42af1e602fb8e1c49f,135bf19361e0e54c8694de19be422ea48cd8e652..6e6a99abbdee1e566b5494622c850e8824032a23
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -47,7 -47,6 +47,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');
@@@ -71,6 -70,8 +71,8 @@@ $oOsm2pgsqlCmd = (new \Nominatim\Shell(
                   ->addParams('--latlong')
                   ->addParams('--append')
                   ->addParams('--slim')
+                  ->addParams('--with-forward-dependencies', 'false')
+                  ->addParams('--log-progress', 'true')
                   ->addParams('--number-processes', 1)
                   ->addParams('--cache', $iCacheMemory)
                   ->addParams('--output', 'gazetteer')