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