Backporting the pngj module to the 2.3.x series