Merge branch 'ma/asciidoctor-more-fixes'