0.11-stable: Backported [8176] from trunk (rework-testing merge).
Authored by: rblank 2009-05-05
Parent: [r8176]
Child: [r8178]