Backported fix for bug 159699 - reviewed by Dirk.
3 files changed