Fix for bug 389092, reviewed by bdoughan
7 files changed