0.12dev: Merged [8585] from 0.11-stable.
Authored by: rblank 2009-09-09
Parent: [r8586]
Child: [r8588]