Merge with changes introduced with Xcode 5.