[V6] Rails 3.0 porting

rebased #333.