Merge branch '2.x' into 3.x

* 2.x:
  Fix map example output

doc/filters/map.rst

@@ -23,7 +23,7 @@ The arrow function also receives the key as a second argument:
         "Alice": "Dupond",
     } %}
 
-    {{ people|map((value, key) => "#{value} #{key}")|join(', ') }}
+    {{ people|map((value, key) => "#{key} #{value}")|join(', ') }}
     {# outputs Bob Smith, Alice Dupond #}
 
 Note that the arrow function has access to the current context.