[V29] Rails 3.0 porting

rebased #593.