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