As usual while waiting for the next release - don't forget to check the nightly builds in the forum.
Here is a preliminary patch (against the XML Compiler branch);
This one doesn't apply for me when copy/pasting it out of here due to invalid characters.