Merge

llvm-svn: 306748
3 files changed