[V30] Rails 3.1 porting

rebased #599.