UPDATE:更新至11.6
Merge branch 'master' into gh-pages