[V6] Rails 3.2 porting

rebased #348.