bcrypt-ruby stable is 3.1
Merge branch '4-0-stable' of github.com:bvogel/rails into 4-0-stable