0.12dev: Merged [8358] from 0.11-stable.
Authored by: rblank 2009-07-14
Parent: [r8358]
Child: [r8360]