0.13dev: Merged [9925] from 0.11-stable.
Authored by: rblank 2010-07-20
Parent: [r9963]
Child: [r9965]