Merge tag '14.0-beta1' into jgrpp

# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp

src/os/unix/unix.cpp

@@ -237,7 +237,7 @@ void ShowOSErrorBox(const char *buf, bool)
 	}
 }
 
-void NORETURN DoOSAbort()
+[[noreturn]] void DoOSAbort()
 {
 	abort();
 }

src/os/windows/crashlog_win.cpp

@@ -56,7 +56,7 @@
 #pragma GCC diagnostic ignored "-Wclobbered"
 #endif
 
-static void NORETURN ImmediateExitProcess(uint exit_code)
+static [[noreturn]] void ImmediateExitProcess(uint exit_code)
 {
 	/* TerminateProcess may fail in some special edge cases, fall back to ExitProcess in this case */
 	TerminateProcess(GetCurrentProcess(), exit_code);

src/os/windows/win32.cpp

@@ -64,7 +64,7 @@ void ShowOSErrorBox(const char *buf, bool system)
 	MessageBox(GetActiveWindow(), OTTD2FS(buf).c_str(), L"Error!", MB_ICONSTOP | MB_TASKMODAL);
 }
 
-void NORETURN DoOSAbort()
+[[noreturn]] void DoOSAbort()
 {
 	RaiseException(0xE1212012, 0, 0, nullptr);