0.13dev: Merged [10033] from 0.12-stable.
Authored by: osimons 2010-09-01
Parent: [r10034]
Child: [r10036]