Merge branch 'ks/commit-abort-on-empty-message-fix' into maint