Commit 1a8aef60 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 12bb7b37 2c6a3445
Pipeline #23794 failed with stage
in 0 seconds