Port last 0.11.7 related changes from 0.11-stable to trunk. Note that here #9104 is fixed differently.
Authored by: cboos 2010-03-10
Parent: [r9341]
Child: [r9343]