Is it OK to merge the following revision(s) to the 6.0 branch?
https://reviews.llvm.org/rL324746
Sounds good to me. r325007.