rails/rails — pull request #7785 by timocratic (2012-09-28 21:40:01+00:00)
Title: backport 68677ffb8298105eb9d3efa26d928dd88cc5e006

Closes #5011