Merge http://llvm.org/git/llvm into develop_35