Branch merge

diff --cc Misc/NEWS
index b553b8ad9c52e7b498548780b356b4fe372a8538,41fc63ecb010c011bffe5a8cbf26001a9c40a29e..920974c53a9aa1428689c93dd55e33bbd2de3250
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,9 -466,10 +466,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13712: pysetup create should not convert package_data to extra_files.
+ 
+ - Issue #11805: package_data in setup.cfg should allow more than one value.
+ 
 +- Issue #13933: IDLE auto-complete did not work with some imported
 +  module, like hashlib.  (Patch by Roger Serwy)
 +
  - Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
  
  - Issue #13676: Handle strings with embedded zeros correctly in sqlite3.