[V35] Rails 3.1 porting

rebased #714.