Merge branch 'jj/doc-markup-gitcli'