Merge "Fix for CVE-2011-3045"