Merge branch 'jc/doc-single-h-is-for-help'