Merge rails-3.2 into master

The time has come. We need to merge this thing to deploy a test instance.