am 58afe329: Merge "Use an older C++ standard."

* commit '58afe329533dc60618186f414d945829706ed772':
  Use an older C++ standard.