[V18] Rails 3.0 porting

rebased #440.