[V3] Rails 3.1 porting

Rebased #306.