Merge branch 'jk/doc-cvs-update' into maint