[V23] Rails 3.1 porting

rebased #495.