Backport of fix for bug 389407
Reviewed by Denise Smith
6 files changed