Merge branch 'fg/document-commit-message-stripping' into next