0.13dev: Merged [10139:10148,10150:10160] from 0.12-stable.
Authored by: rblank 2010-10-01
Parent: [r10161]
Child: [r10163]