0.12dev: Merged [8831] from 0.11-stable.
Authored by: rblank 2009-11-20
Parent: [r8834]
Child: [r8836]