(equivalent to revision 25293 on the ZODB 3.3 branch, but not a merge, since
the files were added separately after the branch was made)