[V31] Rails 3.0 porting

rebased #634.