Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash