TracGuide: integrate changes from t.e.o
Authored by: cboos 2012-09-11
Parent: [r11319]
Child: [r11321]