Merge branch 'mm/maint-doc-commit-edit'