[V14] Rails 3.1 porting

rebased #393.