0.13dev: Merged [10001:10004] from 0.12-stable
Authored by: cboos 2010-08-12
Parent: [r10004]
Child: [r10006]