0.12dev: Merged [8184,8211] from 0.11-stable.
Authored by: rblank 2009-06-01
Parent: [r8251]
Child: [r8253]