0.12dev: Merged [9263] from 0.11-stable.
Authored by: rblank 2010-02-25
Parent: [r9275]
Child: [r9277]