[V17] Rails 3.0 porting

rebased #436.