0.12dev: Merged [8300-8302] from 0.11-stable.
Authored by: rblank 2009-07-06
Parent: [r8349]
Child: [r8351]