delete the cpp11 syntax by accident
Merge branch 'master' into fancy