0.12dev: merged r8518 and r8519 from 0.11-stable.
Authored by: cboos 2009-08-31
Parent: [r8545]
Child: [r8547]