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

* commit '6bafdcb5083b81d295676ee0ff75f62b31214150':
  Fix build in C++11 mode