Replicated changes in #665 aimed at addressing #664. Observed no issues building Cocoa.
Merge pull request #683 from mteper/master

Replicated changes in #665 aimed at addressing #664. Observed no issues ...