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

stack/erp5/buildout.cfg

@@ -475,7 +475,6 @@ eggs = ${neoppod:eggs}
   astor
   APacheDEX
   PyStemmer
-  PyXML
   Pympler
   SOAPpy
   chardet
@@ -720,11 +719,10 @@ Products.PluginRegistry = 1.6
 Products.TIDStorage = 5.5.0
 pyPdf = 1.13
 PyStemmer = 1.3.0
-PyXML = 0.8.5
 Pympler = 0.4.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-erp5diff = 0.8.1.7
+erp5diff = 0.8.1.8
 five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
 google-api-python-client = 1.6.1
@@ -756,7 +754,7 @@ urlnorm = 1.1.4
 uuid = 1.30
 validictory = 1.1.0
 xfw = 0.10
-xupdate-processor = 0.4
+xupdate-processor = 0.5
 selenium = 3.14.1
 scikit-image = 0.14.0
 PyWavelets = 0.5.2