Merge branch 'master' into jgrpp

Remove 'byte' typedef

src/tbtr_template_vehicle_func.cpp

@@ -398,7 +398,7 @@ void TransferCargoForTrain(Train *old_veh, Train *new_head)
 	assert(new_head->IsPrimaryVehicle() || new_head->IsFreeWagon());
 
 	const CargoID cargo_type = old_veh->cargo_type;
-	const byte cargo_subtype = old_veh->cargo_subtype;
+	const uint8_t cargo_subtype = old_veh->cargo_subtype;
 
 	// how much cargo has to be moved (if possible)
 	uint remainingAmount = old_veh->cargo.TotalCount();