FIX: Coupling constraints for vehicles with single freight images and multiple liveries did not work.
CHANGE: Make more efficient use of space in the depot/replace windows (allows more constraints to be shown at once)
FIX: Pointer misalignment in the depot/replace windows from previous commit
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new
FIX: Goods/mail/passengers would sometimes be loaded on convoys going in the wrong direction.
FIX: Reduce the instances of perverse routing when choose signals are used at complicated rail junctions
FIX: Vehicles on waterways did not record way statistics (backported from Standard)
FIX: Possible incorrect routing of road vehicles in some cases
CODE: Fix minor typing error in variable name
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new