[V16] Rails 3.1 porting

Rebased #433.