Merge #11647 update from 3.2

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 5fa8e70c869e1dbc5bbe0359a52e7cbe581aac17,5fb153d5ecf9727abcdf8594fac6ad2f76149e85..8cfce02108c0691cfa05f8d0a6fcafa1fae77bc0
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -83,10 +140,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11647: objects created using contextlib.contextmanager now support
+   more than one call to the function when used as a decorator. Initial patch
+   by Ysj Ray.
+ 
 +- Issue #11930: Removed deprecated time.accept2dyear variable.
 +  Removed year >= 1000 restriction from datetime.strftime.
 +
  - logging: don't define QueueListener if Python has no thread support.
  
  - functools.cmp_to_key() now works with collections.Hashable().