0.13dev: Merged [10091:10124] from 0.12-stable.
Authored by: rblank 2010-09-24
Parent: [r10126]
Child: [r10128]