[V35] Rails 3.2 porting

rebased #638.