0.12dev: Merged [8375] from 0.11-stable.
Authored by: rblank 2009-07-27
Parent: [r8378]
Child: [r8380]