Merge branch 'jc/merge-base-reflog'