Merge branch '3.2'

Closes #8033.

diff --cc Lib/sqlite3/test/userfunctions.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index a399b61ae7e273a134c4894ba0d8fd0125d1e38a,5d2b178c66277f5cbb66cbe59a212df29d755794..2a43734ef2a99e751c12ce3402a1460ec3c06ace
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -479,14 -121,11 +479,17 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #8033: sqlite3: Fix 64-bit integer handling in user functions
+   on 32-bit architectures. Initial patch by Philippe Devalkeneer.
+ 
  - HTMLParser is now able to handle slashes in the start tag.
  
 +- Issue #13641: Decoding functions in the base64 module now accept ASCII-only
 +  unicode strings.  Patch by Catalin Iacob.
 +
 +- Issue #14043: Speed up importlib's _FileFinder by at least 8x, and add a
 +  new importlib.invalidate_caches() function.
 +
  - Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in
    SimpleXMLRPCServer upon malformed POST request.
  

diff --cc Modules/_sqlite/connection.c
Simple merge