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