rails/rails — pull request #11562 by zzak (2013-07-22 20:35:33+00:00)
Title: backport efeb039 from #11201 fixes #11540 [ci skip]

/cc @senny @pftg