am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev

* commit '668f0a356cba44c22d8ca0c9f4711613885d46a9':
  Fix issues that will be present in C++11