(cherry picked from commit a0442893663ac58aa5b5e8cb098951a0aa499878)

Conflicts:
	modules/gui/macosx/playlist.m