[V18] Rails 3.1 porting

rebased #442.