Pull in change from https://github.com/rails/rails/commit/9de9b359d0d24f70f0f6c5c58a7ad8750684d456

Fixes security vulnerability CVE-2012-5664.