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