Merge pull request #2240 from ollie27/libpng