[V11] Rails 3.1 porting

Rebased #371.