Merge pull request #8798 from ja-pa/libpng-security-update