1.0dev: integrate changes from t.e.o TracGuide
Authored by: cboos 2012-09-07
Parent: [r11297]
Child: [r11299]