adapt 3.2.x patch for CVE-2014-0081
Merge pull request #23 from square/nealharris/fix-cve-2014-0081

adapt 3.2.x patch for CVE-2014-0081