[V5] Rails 3.1 porting

rebased #334.