0.12dev: Merged [8575] from 0.11-stable.
Authored by: rblank 2009-09-07
Parent: [r8575]
Child: [r8577]