Merge branch 'master' into jgrpp

# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp

src/saveload/engine_sl.cpp

@@ -106,7 +106,7 @@ static void Load_ENGN()
 			 * Just cancel any previews. */
 			e->flags &= ~4; // ENGINE_OFFER_WINDOW_OPEN
 			e->preview_company = INVALID_COMPANY;
-			e->preview_asked = (CompanyMask)-1;
+			e->preview_asked = MAX_UVALUE(CompanyMask);
 		}
 	}
 }