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