Merged [9411] from 0.11-stable, and prevented [9403,9410] from being merged.
Authored by: rblank 2010-04-05
Parent: [r9436]
Child: [r9438]