This targets the same issue as 5b8a4057, but in a saner approach
(cherry picked from commit f0a7d9a4906754d9c4c5f84354953e8bda79f535)

Conflicts:
	extras/package/macosx/Resources/English.lproj/MainMenu.xib