Merge upstream SRB2 changes

Alam Ed Ariasrequested to merge
upstream-merge into master

This is for fix builds with system libpng 1.6 with apng changes

Merge request reports