0.12.1dev: Merged [10061] from 0.11-stable.
Authored by: osimons 2010-09-08
Parent: [r10061]
Child: [r10063]