0.12dev: Merged [8159] from 0.11-stable.
Authored by: rblank 2009-04-28
Parent: [r8161]
Child: [r8163]