0.12dev: Merged [8345] from 0.11-stable.
Authored by: rblank 2009-07-06
Parent: [r8348]
Child: [r8350]