Merge branch 'jc/doc-maintainer' into maint