Code

Merge commit 'v1.7.0' into jc/checkout-reflog-fix