1.0.1dev: merge changes related to the 0.12.5 release.
Authored by: cboos 2013-01-17
Parent: [r11521]
Child: [r11523]