Updated for changes in Xcode 6.1b2