Fixed Windows compilation issue
Merge branch 'master' into llvm-trunk