[Mosaic/f24] (2 commits) ...Patch for libpng changes