Merge "Fix libpng build under cygwin"