Fix user registration for Ruby 1.9
Merge branch 'master' into production