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

software/metabase/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = a0a375dcd29a21ef121931f40e5e6d51
+md5sum = e0f4847f08e0062ea5a6ba492318afc7

software/peertube/instance-peertube-input-schema.json

@@ -64,7 +64,7 @@
       "type": "string"
     },
     "administrator": {
-      "title":"Administrator",
+      "title": "Administrator",
       "description": "Who is behind the instance? A single person? A non profit?",
       "default": "",
       "type": "string"