[V4] Rails 3.1 porting

Rebased #315.