0.12dev: Merged [8504-8506] from 0.11-stable.
Authored by: rblank 2009-08-25
Parent: [r8506]
Child: [r8508]