Merge branch 'mc/commit-doc-grammofix' into maint