Fix LLVM 3.5 dependency
Merge branch 'merge-2.064' into merge-2.065