am 84851b23: Merge "Move back to C++98."

* commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f':
  Move back to C++98.