Fix for trunk llvm
Merge branch 'master' into optimize-compiler