add new doc version to gendoc
Merge branch 'master' into 2_11