[V29] Rails 3.1 porting

rebased #590.