Updates

Fix from Jack Nagel for CVE-2014-6271.