rails/rails — pull request #7940 by arturopie (2012-10-14 05:20:22+00:00)
Title: Backport fix of issue #7914 to 3-2-stable

See issue #7914 and pull request 7937 for more info.