Changes for Xcode 6.0