Checking password reset key using phpass
Merge pull request #6243 from chrisnharvey/patch-2

Fixing "Invalid key" error when clicking link in password reset email