Fix for bug #416310
6 files changed