Patch suggested by Guido, fixes SF item 611464. Bugfix candidate, will backport to release22-maint myself.
Attach a file by drag & drop or click to upload
