[V12] Rails 3.1 porting

Rebased #384.