0.12dev: merged #3446 related changesets from 0.11.6dev.
Authored by: cboos 2009-09-10
Parent: [r8591]
Child: [r8593]