Incorporate changes from the Xcode 6 branch into master.