Bug 29284 breaks 4.1.2 (not 4.1.1), but fix only applied to trunk?

[François-Xavier Coudert]

Hi,

> This bug apparently was not there with 4.1.1,
> but appeared in 4.1.2. There seems to be a fix
> around, which is only applied to TRUNK, hence
> leaving the 4.1.2 still broken at this issue.

Since Paul is on the road this week, I backported his patch.

FX