libpng revved AGAIN
Merge branch 'master' into jessie-based