Merge remote-tracking branch 'kraxel/pixman.v3' into staging