Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint