Merge branch 'jc/tag-doc' into maint-1.7.11