am ecbdecc1: Merge "Make headers C++11 compatible."

* commit 'ecbdecc1129793f88bbd39fe1f6a485963ea29fe':
  Make headers C++11 compatible.