1.1.1dev: merge #9880 fix and test from 1.0.1dev
Authored by: cboos 2013-01-13
Parent: [r11502]
Child: [r11504]