Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/update.php

diff --cc sql/tables.sql
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc utils/update.php
index 9a509fdfd00e52e403afc31b6ba1789964afda0e,42a7b59e9c2a673243fd472281d6cebd29cf70dc..7448348f14cfb99bad81b045380eaa67ab8b8a5a
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -460,16 -462,8 +462,17 @@@
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
  
                        // Index file
 -                      $sThisIndexCmd = $sCMDIndex;
 +                      if (!isset($aResult['index-instances']))
 +                      {
 +                              if (getLoadAverage() < 15)
 +                                      $iIndexInstances = 2;
 +                              else
 +                                      $iIndexInstances = 1;
 +                      } else
 +                              $iIndexInstances = $aResult['index-instances'];
 +
 +                      $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
+                       $fCMDStartTime = time();
  
                        if (!$aResult['no-npi'])
                        {