Merge "Backport of fix for CVE-2015-0973 to libpng 1.2." into klp-dev