Changes included (1 change).

Change 2128 by steve (5 files): And another test fix...