Merge "Fix build with current clang master"