1.1.1dev: merged 0.12.5 related changes, from 1.0-stable branch.
Authored by: cboos 2013-01-17
Parent: [r11526]
Child: [r11528]