1.0-stable: merged r11423 and r11424 from 0.12-stable
Authored by: cboos 2012-10-27
Parent: [r11426]
Child: [r11428]