CP-4: Updates by Xcode 6.