Merge pull request #6010 from neheb/apple