[V33] Rails 3.1 porting

rebased #712.