Message 111257 - Python tracker

We might as well backport Antoine's patch rather than take this one (even if mine for 2.x already). It would be weird to have 2 wildly different patches to solve the same problem.

Maybe close this ticket and flag issue7105 for backporting?