Merge branch 'jt/sha1-file-cleanup'