0.13dev: Merged [10062] from 0.12-stable. See [10061] in 0.11-stable for docs.
Authored by: osimons 2010-09-08
Parent: [r10062]
Child: [r10064]