[V16] Rails 3.2 porting

rebased #434.