Updated to match Xcode6 beta 5