backports CVE-2013-0155
Merge branch 'security/CVE-2013-0155'