[V15] Rails 3.1 porting

rebased #407.