Merge branch 'master' into jgrpp-beta

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp

src/network/core/tcp.h

@@ -21,6 +21,9 @@
 #include <map>
 #include <memory>
 #include <thread>
+#if defined(__MINGW32__)
+#include "3rdparty/mingw-std-threads/mingw.thread.h"
+#endif
 
 /** The states of sending the packets. */
 enum SendPacketsState {