Changes for Xcode 6.1