0.12dev: Merged [8288] from 0.11-stable.
Authored by: rblank 2009-06-23
Parent: [r8289]
Child: [r8291]