[V9] Rails 3.1 porting

Rebased #361.