Merge r1230069 from trunk: Submitted by: jorton Reviewed/backported by: jim SECURITY (CVE-2012-0031) patch