Merged r6527

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6527 8aca7d54-2c30-db11-9de9-000461428c89