rails/rails — pull request #5898 by benedikt (2012-04-19 10:26:29+00:00)
Title: Readds the fix for #5667 and back ports the regression fix from #5718

This reverts the revert of the fix for #5667 and backports the fix for the regression (#5718) described in #5667 to 3-2-stable.