CHANGE: Scale factory passenger demand according to the meters per tile (necessary as this changes the time scale)
Trivial commmit
Merge branch '11x-fixes' of git://github.com/neroden/simutrans.git into 11.x
CHANGE: Some performance optimisations
Merge branch '11x-fixes' of git://github.com/neroden/simutrans.git into 11.x

Conflicts:
	simfab.cc
Merge branch '11x-fixes' of git://github.com/neroden/simutrans.git into 11.x

Conflicts:
	simhalt.cc
Merge remote-tracking branch 'jamespetts/11.x' into 11x-fixes
Fix errors introduced by James while merging my code.
Merge branch '11x-fixes' into merge-from-standard
Correct the save game version for the accounting merge (it was messed up by merge from experimental)