Merging fix for bug 3081009 from trunk into branch.
Authored by: mgricken 2010-10-04
Parent: [r5401]
Child: [r5403]