am d34b6378: Merge "Global C++11 compatibility."

* commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec':
  Global C++11 compatibility.