Merge branch 'jn/xml-depends-on-asciidoc-conf'