[v3] Possible fix for PR 5730

[Gabriel Dos Reis]

jlquinn@optonline.net writes:

| Gabriel Dos Reis writes:
|  > jlquinn@optonline.net writes:
|  > 
|  > [...]
|  > 
|  > | I think this is sufficient to close the bug.  What do you think?
|  > 
|  > Agreed.
|  > 
|  > -- Gaby
| 
| So this can go on 3.3 and mainline?

Certainly; that was implied.

-- Gaby