Merge pull request #697 from antonlacon/libpng-1.2.x