merge os x changes
merge os x changes