Fixed tests for sha1 renaming
Merge branch 'master' into gmail