[V38] Rails 3.1 porting

rebased #774.