Merge branch 'cc/sha1-bsearch' into HEAD