Comment 16 for bug 231106

Fix commited on the trunk and on the 0.12 branch.