Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php

diff --cc settings/settings.php
Simple merge

diff --cc utils/setup.php
index 45b40fedfc463bb7b0f3d32183628958e5953670,473d0cb0bce8aa686750122a1af60ba8d74dab86..6bd2105574519405a831cbaeabd30f8b3ee86d5f
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -154,9 -154,9 +154,10 @@@
                        echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
                        fail("osm2pgsql not found in '$osm2pgsql'");
                }
 +              $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -              $osm2pgsql .= ' -C '.$iCacheMemory;
 +              $osm2pgsql .= ' -C 16000';
+               $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);