Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index db280a621d15364f757cb141e3914ebfc702cdd6,f0b45b428cf4b866c624ea5717272337bc3e1b7a..4897aa72f88b0619e53a1bd69063724e4764fd04
--- 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');
@@@ -279,9 -278,11 +279,11 @@@ if ($aResult['recompute-word-counts']) 
  
  if ($aResult['index']) {
      $oCmd = (clone $oIndexCmd)
-             ->addParams('--minrank', $aResult['index-rank']);
+             ->addParams('--minrank', $aResult['index-rank'], '-b');
+     $oCmd->run();
  
-     // echo $oCmd->escapedCmd()."\n";
+     $oCmd = (clone $oIndexCmd)
+             ->addParams('--minrank', $aResult['index-rank']);
      $oCmd->run();
  
      $oDB->exec('update import_status set indexed = true');
@@@ -422,9 -423,18 +424,18 @@@ if ($aResult['import-osmosis'] || $aRes
  
          // Index file
          if (!$aResult['no-index']) {
-             $oThisIndexCmd = clone($oIndexCmd);
              $fCMDStartTime = time();
  
+             $oThisIndexCmd = clone($oIndexCmd);
+             $oThisIndexCmd->addParams('-b');
+             echo $oThisIndexCmd->escapedCmd()."\n";
+             $iErrorLevel = $oThisIndexCmd->run();
+             if ($iErrorLevel) {
+                 echo "Error: $iErrorLevel\n";
+                 exit($iErrorLevel);
+             }
+ 
+             $oThisIndexCmd = clone($oIndexCmd);
              echo $oThisIndexCmd->escapedCmd()."\n";
              $iErrorLevel = $oThisIndexCmd->run();
              if ($iErrorLevel) {