Issue #10747: Merge with 3.4

diff --cc Misc/NEWS
index 81bf254f9c59b8e7883f8e53da6ece82fa81d312,128937ef8743dc5294c7c535e604cccf12d4d399..b6042b28efc454f15ac692e77c2a5cece2059b45
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1,4 -1,4 +1,4 @@@
--+++++++++++
+++++++++++++
  Python News
  +++++++++++
  
@@@ -679,12 -530,6 +679,14 @@@ Tools/Demo
  - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
    Patch by Arfrever Frehtes Taifersar Arahesis.
  
 +Windows
 +-------
 +
 +- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
 +  updated to 1.0.1h.
 +
++- Issue #10747: Use versioned labels in the Windows start menu.
++  Patch by Olive Kilburn.
  
  What's New in Python 3.4.0?
  ===========================

diff --cc Tools/msi/msi.py
Simple merge