Merge heads

diff --cc Misc/NEWS
index dededc7df27b8ef37991eb709d60c93d592626af,1bbb17e29fbb02561ae992620d8689bad68a73e1..75c832ceb1cc81fc7d4a29d3c9c28b0063208620
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,9 -24,8 +24,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
 +  docstrings and ValueError messages. Patch by Zhongyue Luo
 +
+ - Fix refcounting issue with extension types in tkinter.
+ 
  - Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
    if methods have annotations; it now correctly displays the annotations.