Use public domain SHA1 code, remove libgcrypt dependency
Merge branch 'master' into gmail
Merge remote-tracking branch 'origin/gmail' into gmail