Merge branch 'tg/next/1.0__asciidoc.conf' into tg/next/1.0