Merge pull request #6722 from adgear/2-3-stable

Backported rails 2.3 fix for CVE-2012-2695