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