rails/rails — pull request #11042 by robin850 (2013-06-21 08:42:42+00:00)
Title: Backport #11033 to 4-0-0

Backport pull request #11033 to 4-0-0

/cc @fxn