[V25] Rails 3.2 porting

rebased #497.