Fix build with LLVM 3.5
Merge branch 'master' into merge-2.064