Updated for Xcode 6 Beta6