Merge "Fix build in C++11 mode"