Merge branch 'libpng16' of git://github.com/barkovv/libpng into libpng16