[V13] Rails 3.1 porting

rebased #390.