Merge branch 'jc/sha1-name-more'