Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php

diff --cc utils/setup.php
index be422949b6b1e8945d988d97a20f5224d92d7b2a,782665d7f61f9fbc096804e44c5a8d19ad7d265c..0ecf5e6d97ac3e3668dc162d0d4c09107c410043
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -200,8 -200,8 +200,8 @@@
                        $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
                if (CONST_Tablespace_Place_Index)
                        $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
-               $osm2pgsql .= ' -lsc -O gazetteer --hstore';
+               $osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
 -              $osm2pgsql .= ' -C '.$iCacheMemory;
 +              $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);

diff --cc utils/update.php
Simple merge