[V27] Rails 3.1 porting

rebased #572.