Merge "Fix build with clang in C++11 mode"