0.12dev: Merged [8816,8819,8820] from 0.11-stable.
Authored by: rblank 2009-11-20
Parent: [r8833]
Child: [r8835]