Have seen it too late to announce it in the commit message but this
patch solves also Bug #11715

Best,

Erik