Another master merged into the zoom branches

This is a merge done on a separate branch. It could/almost certainly will lead to a branching point mismatch when comparing against master but will mean any merge done on an unprotected zoom_merge won't change any code (in theory).

doc/RTD/source/NewOption/index.rst

@@ -34,3 +34,8 @@ In order to add a new scheme, you will need to:
    ``nobase_noinst_HEADERS``, add your new header files.
 
 6. Update the documentation.  Add your equations/documentation to ``doc/RTD``.
+
+.. toctree::
+   :caption: Table of Contents
+
+   sink_adding_new_scheme