[V34] Rails 3.1 porting

rebased #713.