Attempt to unbreak the Windows build
Merge branch 'master' into llvm-trunk