Merged r10578 from stable (fix for #10039)
Authored by: cboos 2011-02-21
Parent: [r10578]
Child: [r10580]