(cherry picked from commit 3d64617d9347481beb9274b660694727c618c912)

Conflicts:
	modules/gui/macosx/fspanel.m