Code

Merge branch 'jc/upstream-reflog'