Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index 05c43946e2d1282c48c1613fe67390399fb7874e,c933d26ec19f0af57456cdcd7bd971ee85f3d6f3..d8d3efd98e1ecce4f8d041bd2c41865926efc226
--- 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');
@@@ -435,7 -434,7 +435,7 @@@ if ($aResult['import-osmosis'] || $aRes
  
              $sSQL = 'INSERT INTO import_osmosis_log';
              $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)';
-             $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'";
+             $sSQL .= " values ('$sBatchEnd',$iEndSequence,NULL,'";
              $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','";
              $sSQL .= date('Y-m-d H:i:s')."','index')";
              var_Dump($sSQL);