PlatformMacOSX.mm reverted to upstream version due to incorrect merge
proper merge of PlatformMacOSX.mm changes