am a5e2e870: Merge "Fix build in C++11 mode"

* commit 'a5e2e870cace66ae164032e018d70328c4be57b3':
  Fix build in C++11 mode