Merge upstream changes in Mistral2 for clang compatibility.