[V24] Rails 3.0 porting

rebased #534.