Merge branch 'tz/asciidoctor-fixes'