Merge remote-tracking branch 'llvm-upstream/master'