CHANGE: Improved performance when multiple vehicles are loading at a stop (TurfIt)
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new
Merge branch 'devel-new' into 112.5-merge

Conflicts:
	simconvoi.cc
	simhalt.h
	vehicle/simvehikel.cc
	vehicle/simvehikel.h
Merge branch '112.5-merge' into way-improvements