Port to LLVM 3.5
Merge pull request #3125 from heftig/master

Port to LLVM 3.5