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