Merge branch 'jc/reflog-expire' into maint