Merge branch 'libpng16' of ../../libpng into libpng16