[V33] Rails 3.2 porting

rebased #592.