Fix for CVE-2017-0378