am 32fb8b2d: Merge "Fix C++11 build."

* commit '32fb8b2d9f8399a745a26dddc031cc16867ada2d':
  Fix C++11 build.