Merge branch 'master' into jgrpp

# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp

src/video/cocoa/wnd_quartz.mm

@@ -297,7 +297,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
 	this->window_height = height;
 	this->buffer_depth = bpp;
 
-	[ this->window center ];
+	[ (OTTD_CocoaWindow *)this->window center ];
 
 	/* Only recreate the view if it doesn't already exist */
 	if (this->cocoaview == nil) {