Merge current state of rework-testing on 0.11-stable (backport of relevant parts of r8131)
Authored by: cboos 2009-04-22
Parent: [r8131]
Child: [r8133]