Code

Merge branch 'jc/checkout-reflog-fix' into maint