Merge branch 'rs/sha1-file-close-mapped-file-on-error'