Merge branch '32bpp_rgba_png_support'