am 2ec9b4e4: am e1eaca2e: Merge "More C++11 compatibility."

* commit '2ec9b4e4156fdfc6027382fc6db51dce9383cc40':
  More C++11 compatibility.