am 4f1fe2f5: Merge "Fix build in C++11 mode"

* commit '4f1fe2f59889d88ed026596c1841043db7edbc6f':
  Fix build in C++11 mode