Merge branch 'c++11' in preparation for version 1.7.0.