Update to 20180404.
PR: 226831 Submitted by: maintainer MFH: 2018Q2 Security: CVE-2018-8741 Sponsored by: Absolight