Merge pull request #1547 from Igalia/apinheiro/xfb-struct-assignment