Merge "Explicitly use an older C++ standard."