Merge pull request #3745 from D-Albers/libpng