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

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