Attempt to fix Linux crashes
Merge branch 'master' into llvm-trunk