Merge branch 'jc/namespace-doc-with-old-asciidoc'