Merge branch '6.0' into 6.1

* 6.0:
  Fix options path in composer.json

Author: javiereguiluz

components/runtime.rst

@@ -310,7 +310,7 @@ can be set using the ``APP_RUNTIME_OPTIONS`` environment variable::
 
     // ...
 
-You can also configure ``extra.runtime.options`` in ``composer.json``:
+You can also configure ``extra.runtime`` in ``composer.json``:
 
 .. code-block:: json