[V28] Rails 3.1 porting

rebased #577.