0.12dev: Merged [9052] from 0.11-stable.
Authored by: rblank 2010-01-20
Parent: [r9052]
Child: [r9054]