Merged in changes between PRE11_ROOT and LLVM_PRE111 (i.e. the beginning of