Merge branch 'mw/doc-typofixes' into maint