Merge branch '2.11.x'

diff --cc CHANGES.rst
index 5e307f8571ad3e791344cc7f112c9d8d945983d7,651ab43089dbc0d32ebfb4d349a88644236e56b2..2253fe9c8893d9e2f0ddd27d00aba8e3e8d63e75
--- 1/CHANGES.rst
--- 2/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,15 -1,16 +1,26 @@@
  .. currentmodule:: jinja2
  
 +Version 3.0.0
 +-------------
 +
 +Unreleased
 +
 +-   Drop support for Python 2.7 and 3.5.
 +-   Bump MarkupSafe dependency to >=1.1.
 +-   Bump Babel optional dependency to >=2.1.
 +
 +
+ 2.11.2
+ ------
+ 
+ Unreleased
+ 
+ -   Fix a bug that caused callable objects with ``__getattr__``, like
+     :class:`~unittest.mock.Mock` to be treated as a
+     :func:`contextfunction`. :issue:`1145`
+ 
+ 
+ 
  Version 2.11.1
  --------------