Merge branch 'feature/c++11'