CVE-2012-5664 options hashes should only be extracted if there are extra parameters
Merge remote-tracking branch 'rails/2-3-stable' into 2-3-stable