Merge branch 'jc/sha1-lookup'