Merge branch 'kl/pretty-doc-markup-fix'