[V26] Rails 3.0 porting

rebased #569.