[V37] Rails 3.1 porting

rebased #748.