fix build with libpng16
Merge commit 'origin/master'