Merge branch 'libpng16' of https://github.com/jbowler/libpng-1 into libpng16