Merge branch 'bc/sha-256-cvs-svn-updates'