0.12dev: Merged [8218,8239,8242] from 0.11-stable.
Authored by: rblank 2009-06-01
Parent: [r8253]
Child: [r8255]