Merge "Drop GCC back to C++11."