Merge with upstream - Fix CVE-2014-1943