0.12dev: Merged [8997] from 0.11-stable.
Authored by: rblank 2010-01-03
Parent: [r8997]
Child: [r8999]