[V31] Rails 3.1 porting

rebased #636.