Merge in jonathanj's trac-0.12 template work.
Revert "Merge in jonathanj's trac-0.12 template work."

This reverts commit 12acf87492d5ce78faae440db399a14e0251ea56.
Pull in jonathanj's updated work.