Update trac config to reflect reality.
Merge remote-tracking branch 'origin/master'