Merge 3.4

diff --cc Misc/NEWS
index 5c6a5be4903c31d11ba909573d9fd8e87f503792,36322c237356bfc9dd74a10c5c3a7b54f53c0a90..b26db8cfcc0a6f6f22b634381b45d7814cf4bf7e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -244,8 -167,9 +244,14 @@@ IDL
  Build
  -----
  
++<<<<<<< local
 +- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
 +  Include/opcode.h from Lib/opcode.py if the later gets any change.
++=======
+ - Issue #15234: For BerkelyDB and Sqlite, only add the found library and
+   include directories if they aren't already being searched. This avoids
+   an explicit runtime library dependency.
++>>>>>>> other
  
  - Issue #20644: OS X installer build support for documentation build changes
    in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.