Merge branch 'jc/maint-reflog-bad-timestamp' into maint