Merge branch 'jj/doc-markup-gitcli' into maint