[V22] Rails 3.1 porting

rebased #487.