[V16] Rails 3.0 porting

rebased #421.