1.1.1dev: merge from 1.0-stable (fix for #10642)
Authored by: cboos 2012-10-03
Parent: [r11386]
Child: [r11388]