Merge pull request #23975 from krant/libwebp