Xcode6.1 upstream merge

Getting the latest upstream Xcode 6.1 code