Merge branch '1.3'

* 1.3:
  tweaked previous merge
  [WIP] Mention use of controller() function in docs

doc/providers/twig.rst

@@ -145,6 +145,13 @@ is registered):
 
     {{ render(url('sidebar')) }}
 
+    {# or you can reference a controller directly without defining a route for it #}
+    {{ render(controller(controller)) }}
+
+.. note::
+
+    Read the Twig reference_ for Symfony document to learn more about the various Twig functions
+
 Traits
 ------
 
@@ -184,3 +191,5 @@ You can configure the Twig environment before using it by extending the
 
 For more information, check out the `official Twig documentation
 <http://twig.sensiolabs.org>`_.
+
+.. reference_:: https://symfony.com/doc/current/reference/twig_reference.html#controller