0.12dev: Merged [8516] from 0.11-stable.
Authored by: rblank 2009-08-26
Parent: [r8516]
Child: [r8518]