Comment 3 for bug 340134

Merged onto 0.5