[V31] Rails 3.2 porting

rebased #574.