Merge changes from 0.11-stable (fixes for #7512 and #9032)
Authored by: cboos 2010-02-18
Parent: [r9203]
Child: [r9205]