(cherry picked from commit 4ebe98116b867af109d051c376b266653b224923)

Conflicts:
	modules/gui/macosx/CompatibilityFixes.h
	modules/gui/macosx/intf.m