Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp

src/settings.cpp

@@ -471,7 +471,7 @@ void IntSettingDesc::MakeValueValid(int32 &val) const
 					uval = (uint32)this->def;
 				}
 			}
-			val = (int32)val;
+			val = (int32)uval;
 			return;
 		}
 		case SLE_VAR_I64:
@@ -893,7 +893,7 @@ static void UpdateConsists(int32 new_value)
 }
 
 /* Check service intervals of vehicles, newvalue is value of % or day based servicing */
-static void UpdateServiceInterval(int32 new_value)
+static void UpdateAllServiceInterval(int32 new_value)
 {
 	bool update_vehicles;
 	VehicleDefaultSettings *vds;