0.12dev: Merged [8578-8579] from 0.11-stable.
Authored by: rblank 2009-09-08
Parent: [r8579]
Child: [r8581]