[V39] Rails 3.1 porting

rebased #791.