Merge common changes from OS X