Branch merge

diff --cc Misc/NEWS
index d33f3413ddde9d50fb8b2e5789a1b09bb05a161c,1ecb1255794be61910c205d07b880e52ccb99065..186ea2145cfb4d6b8a080cf19a61a6d4d79269e9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -43,10 -43,12 +43,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was
+   configured with different prefix and exec-prefix.
+ 
+ - Issue #11254: Teach distutils to compile .pyc and .pyo files in
+   PEP 3147-compliant __pycache__ directories.
+ 
 +- Issue #11250: Back port fix from 3.3 branch, so that 2to3 can handle files
 +  with line feeds.  This was ported from the sandbox to the 3.3 branch, but
 +  didn't make it into 3.2.
 +
  - Issue #7367: Fix pkgutil.walk_paths to skip directories whose
    contents cannot be read.