Fixes map scrolling issue.

Fixes #567.
Fixes #554.
Backporting 1.5's UnsaltedSHA1Hasher

Required for porting Davis
Merge branch 'master' into davis_master