backports CVE-2013-0155
Merge pull request #17 from opf/security/CVE-2013-0155

backports CVE-2013-0155