Merge branch 'dd_ordering' into zope-2.13