SHA1 fix
Merge branch 'testserver'