0.12dev: Merged [8648:8650] from 0.11-stable.
Authored by: rblank 2009-10-09
Parent: [r8653]
Child: [r8655]