Merge "Fix building on modern versions of Xcode and OS X."