Merge tag '14.0-beta2' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp

src/vehicle_gui.cpp

@@ -1040,7 +1040,7 @@ struct RefitWindow : public Window {
 
 		Money money = cost.GetCost();
 		if (_returned_mail_refit_capacity > 0) {
-			SetDParam(2, CT_MAIL);
+			SetDParam(2, GetCargoIDByLabel(CT_MAIL));
 			SetDParam(3, _returned_mail_refit_capacity);
 			if (this->order != INVALID_VEH_ORDER_ID) {
 				/* No predictable cost */