Merge branch 'c++11'.