Reapplying 59a630741

Sorry, I accidentally reverted 59a630741, this fixes that.

Devise timeout aren't squashed anymore.
Merge pull request #519 from pjaspers/patch-1

Reapplying 59a630741