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

3 jobs for zope4py2 in 0 seconds (queued for 1 second)
Status Job ID Name Coverage
  External
failed ERP5.CodingStyleTest-Zope4Py2

00:54:24

failed ERP5.UnitTest-Zope4Py2

01:08:48

failed SlapOS.SoftwareReleases.IntegrationTest-Zope4Py2

03:42:00