[V26] Rails 3.1 porting

rebased #558.