Merge pull request #4872 from champtar/sha256