Can you please also apply it on the 4.2 branch. I would do it myself but it hasn't turned up in the mirror yet (which is strange - maybe something is wrong with the mirror?), and I think you changed it a bit compared to the version in bugzilla. Thanks, Duncan.