0.12dev: Merged [8558] from 0.11-stable.
Authored by: rblank 2009-09-01
Parent: [r8558]
Child: [r8560]