Fix for CVE-2013-2877