Replace forgotten + by <<
Merge branch 'master' into llvm-trunk