Merge branch 'jk/reset-reflog-message-fix' into maint