Merge branch 'jk/asciidoc-markup-fix' into maint