MFH r371178,373115,374478,375351
- Update to 1.5.21
- Add CPE information

Security:	Fixed an overflow in png_combine_row with very wide interlaced images