[V6] Rails 3.1 porting

rebased #347.