0.12dev: merge r8502, r8511 and r8512 from 0.11-stable.
Authored by: cboos 2009-08-26
Parent: [r8512]
Child: [r8514]