Merge branch 'master' into jgrpp-beta

# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp

src/network/network_udp.cpp

@@ -64,10 +64,10 @@ struct UDPSocket {
 
 	UDPSocket(const std::string &name_) : name(name_), socket(nullptr) {}
 
-	void Close()
+	void CloseSocket()
 	{
 		std::lock_guard<std::mutex> lock(mutex);
-		socket->Close();
+		socket->CloseSocket();
 		delete socket;
 		socket = nullptr;
 	}
@@ -715,9 +715,9 @@ void NetworkUDPServerListen()
 /** Close all UDP related stuff. */
 void NetworkUDPClose()
 {
-	_udp_client.Close();
-	_udp_server.Close();
-	_udp_master.Close();
+	_udp_client.CloseSocket();
+	_udp_server.CloseSocket();
+	_udp_master.CloseSocket();
 
 	_network_udp_server = false;
 	_network_udp_broadcast = 0;