[V36] Rails 3.1 porting

rebased #737.