0.13dev: Merged [10125:10128] from 0.12-stable.
Authored by: rblank 2010-09-24
Parent: [r10129]
Child: [r10131]