Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint