Fix copy&paste error
Merge branch 'master' into llvm-trunk