[V21] Rails 3.1 porting

rebased #473.