am 409b471e: Merge "Explicitly use an older C++ standard."

* commit '409b471e481421d623c0c6f88feb11e66a1dc987':
  Explicitly use an older C++ standard.