am 4b2e98fc: Merge "Fix C++14 bitrot."

* commit '4b2e98fc8c257a27a95fecbc859fcc617e2fa827':
  Fix C++14 bitrot.