1.0dev: integrate changes from t.e.o's wiki in preparation for rc1
Authored by: cboos 2012-09-01
Parent: [r11239]
Child: [r11241]