[V25] Rails 3.0 porting

rebased #556.