0.13dev: Merged [10012:10015] from 0.12-stable.
Authored by: rblank 2010-08-25
Parent: [r10015]
Child: [r10017]