Brings us to the top of the PHPUnit 3.5 branch

TEST!