[V30] Rails 3.0 porting

rebased #597.