[V20] Rails 3.0 porting

rebased #471.