Merge "Fix compilation with Clang."