am cfb7ebe1: Merge "Fix C++11 violations"

* commit 'cfb7ebe1b2dfd31b408f6aa6e3f3fcdf89baa6c4':
  Fix C++11 violations