[V7] Rails 3.1 porting

Rebased #353.