Merge branch 'ma/asciidoctor-fixes'