Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/french.txt
#	src/network/network_udp.cpp

src/video/sdl2_v.h

@@ -20,7 +20,7 @@
 /** The SDL video driver. */
 class VideoDriver_SDL_Base : public VideoDriver {
 public:
-	VideoDriver_SDL_Base() : sdl_window(nullptr) {}
+	VideoDriver_SDL_Base() : sdl_window(nullptr), buffer_locked(false) {}
 
 	const char *Start(const StringList &param) override;