Merge remote-tracking branch 'trunk' into 32bpp