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

3 jobs for zope4py2
in 0 seconds, using 0 compute credits, and was queued for 1 second