am c185902e: Merge "Use C++11."

* commit 'c185902e393cd71823258016ead1b315ed062b24':
  Use C++11.