Patch written by Martin Panter. I replace tearDown() with addCleanup().
Attach a file by drag & drop or click to upload
