updated against Xcode beta 6