Merge branch 'gh/gpg-doc-markup-fix'