Propagating prior merge from 'llvm.org/master'.
Propagating prior merge from 'llvm.org/master'.

apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang