rails/rails — pull request #11523 by Empact (2013-07-20 23:47:36+00:00)
Title: Backport #4224 to 3-2-stable.

This is a version of #4481 that makes the functional changes while attempting to be minimally invasive.