Merge branch '2.13' of https://github.com/eea/Zope into eea-2.13

Conflicts:
	doc/CHANGES.rst

doc/CHANGES.rst

@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/
 2.13.24 (unreleased)
 --------------------
 
+- Issue #43: Fix Zope failing to start if a zoperunner is configured.
+
 - PR #51:  Harden debug control panel's module-crawling against trickery
   performed by ``six``.
 

src/Zope2/Startup/zopeschema.xml

@@ -198,6 +198,17 @@
       </description>
     </key>
 
+    <key name="start-timeout" datatype="integer" required="no"
+        default="300">
+        <description>
+            When a start-test-program is supplied, a process won't be
+            considered to be started until the test program exits normally
+            or until start-timout seconds have passed.
+
+            This defaults to 300 seconds (5 minutes).
+        </description>
+    </key>
+
   </sectiontype>
 
   <sectiontype name="zodb_db" datatype=".ZopeDatabase"