[V24] Rails 3.1 porting

rebased #518.