merged branch which aimed in getting the test running on unix systems, too
Zope Foundation and Contributors