Merge branch 'master' into jgrpp

# Conflicts:
#	src/ai/ai_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/genworld_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/newgrf_sound.cpp
#	src/roadveh.h
#	src/sound.cpp
#	src/station_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_gui.cpp

src/script/api/script_cargo.cpp

@@ -85,5 +85,5 @@
 /* static */ int64 ScriptCargo::GetWeight(CargoID cargo_type, uint32 amount)
 {
 	if (!IsValidCargo(cargo_type)) return -1;
-	return ::CargoSpec::Get(cargo_type)->weight * static_cast<int64>(amount) / 16;
+	return ::CargoSpec::Get(cargo_type)->WeightOfNUnits(amount);
 }