Merge with 3.3

diff --cc Misc/NEWS
index 856f89309024f63ee12194afbe673cf757492791,03f9e2f8f7e1ab41321cb4865659a0b560d7fa68..7e8712fbf2401e940527e9cf4a1006b1b0d1089c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1251,6 -914,12 +1251,8 @@@ Buil
  Documentation
  -------------
  
++- Issue #15940: Specify effect of locale on time functions.
++
  - Issue 17538: Document XML vulnerabilties
  
  - Issue #16642: sched.scheduler timefunc initial default is time.monotonic.