merge Themaister's libpng 1.5 fix