Comment 3 for bug 872344

Merged to master, rel_2_1, and rel_2_0