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