[V10] Rails 3.1 porting

Rebased #363.