[V36] Rails 3.2 porting

rebased #651.