0.12dev: Merged [8136] from 0.11-stable.
Authored by: rblank 2009-04-25
Parent: [r8143]
Child: [r8145]