Merge from mainline.

llvm-svn: 51870
1 file changed