Merge branch 'jc/doc-git-updates' into maint