[V19] Rails 3.0 porting

rebased #445.