merge from 3.2

diff --cc Misc/NEWS
index a67012656ec097b21b9d7686e2ad078e300d6bc0,01274a11f85e76ba3a650445dc182805c5273843..5cf9ac60757294860d3b02d5c0da9bf3bb7167a4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,6 -83,6 +140,10 @@@ Core and Builtin
  Library
  -------
  
++- Issue #10684: shutil.move used to delete a folder on case insensitive
++  filesystems when the source and destination name where the same except
++  for the case.
++
  - 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.