Fix for CVE-2014-0076 backported to 0.9.8 branch