Merge remote-tracking branch 'upstream/dev' into extras--allow-png-rgba--dev