Merged fix for bug 295771 from HEAD.
27 files changed