Merge branch 'libpng16' of ssh://git.code.sf.net/p/libpng/code into libpng16