Merge branch 'master' into jgrpp-beta

# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h

src/network/network_content.cpp

@@ -808,7 +808,9 @@ void ClientNetworkContentSocketHandler::Connect()
 void ClientNetworkContentSocketHandler::Close()
 {
 	if (this->sock == INVALID_SOCKET) return;
-	NetworkContentSocketHandler::Close();
+
+	this->CloseConnection();
+	this->CloseSocket();
 
 	this->OnDisconnect();
 }