Zim

Comment 8 for bug 691273

Fix commited in rev485