Merge branch 'jc/fsck-reflog'