Protect against brute forcing
Merge remote-tracking branch 'evdo/master'