(cherry picked from commit 59d6ab773e2fcb7b112cee692ce34996491ce4b2)

Conflicts:
	NEWS
	modules/gui/macosx/fspanel.m