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

Backport of #11033 to 4-0-stable.

/cc @fxn