Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk