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