[V19] Rails 3.1 porting

rebased #447.