rails/rails — pull request #11039 by robin850 (2013-06-21 08:31:54+00:00)
Title: Backport #11033 to master

Backport #11033 to master.

/cc @fxn