[V32] Rails 3.1 porting

rebased #657.