Attempt to unbreak builds
Merge branch 'master' into llvm-trunk