[V25] Rails 3.1 porting

rebased #536.