1.0dev: merge changes from 0.12-stable
Authored by: cboos 2012-09-07
Parent: [r11304]
Child: [r11306]