0.12dev: Merged [8582] from 0.11-stable.
Authored by: rblank 2009-09-08
Parent: [r8582]
Child: [r8584]