[V21] Rails 3.2 porting

rebased #451.