1.0-stable: merged fix for #10920 from 0.12-stable
Authored by: cboos 2012-10-27
Parent: [r11425]
Child: [r11427]