Update for compatibility with Xcode 6 Beta 6