Merge branch 'jk/stripspace-asciidoctor-fix' into maint