Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
Simple merge

diff --cc lib/lib.php
Simple merge

diff --cc utils/update.php
index 475e583690e9e71a8585322630181433c9c999ab,b106c56740907a6c225127557e282cdcb392f80d..ad6274825f074aab360a68414de039ce9e42d32c
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -36,7 -37,7 +37,13 @@@ $aCMDOption
    );
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
--if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
++if (!isset($aResult['index-instances'])) {
++    if (getLoadAverage() < 24)
++        $aResult['index-instances'] = 2;
++    else
++        $aResult['index-instances'] = 1;
++}
++
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');