Merge from 3.5

diff --cc Tools/msi/buildrelease.bat
index e34aeac7931e40247ab631d3920280cba7e16a19,1fa2dcb53407a7227b9b42319fab262cf1e44a82..e7d225d54975588618cce38ae6e2f580ca81bb2a
--- 1/Tools/msi/buildrelease.bat
--- 2/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@@ -35,7 -35,9 +35,9 @@@ set BUILDX86
  set BUILDX64=\r
  set TARGET=Rebuild\r
  set TESTTARGETDIR=\r
 -set PGO=\r
 +set PGO=default\r
+ set BUILDNUGET=1\r
+ set BUILDZIP=1\r
  \r
  \r
  :CheckOpts\r
@@@ -55,7 -57,8 +57,9 @@@ if "%1" EQU "--build" (set TARGET=Build
  if "%1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts\r
  if "%1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts\r
  if "%1" EQU "--pgo" (set PGO=%~2) && shift && shift && goto CheckOpts\r
 +if "%1" EQU "--skip-pgo" (set PGO=) && shift && goto CheckOpts\r
+ if "%1" EQU "--skip-nuget" (set BUILDNUGET=) && shift && goto CheckOpts\r
+ if "%1" EQU "--skip-zip" (set BUILDZIP=) && shift && goto CheckOpts\r
  \r
  if "%1" NEQ "" echo Invalid option: "%1" && exit /B 1\r
  \r
@@@ -170,21 -178,23 +174,29 @@@ if not "%SKIPBUILD%" EQU "1" 
      @echo off\r
  )\r
  \r
 -set BUILDOPTS=/p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%\r
 -if "%PGO%" NEQ "" set BUILDOPTS=%BUILDOPTS% /p:PGOBuildPath=%BUILD%\r
 -msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
 -msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild /p:Platform=%1 %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true\r
 +if "%OUTDIR_PLAT%" EQU "win32" (\r
 +    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
 +    if errorlevel 1 exit /B\r
 +) else if not exist "%PCBUILD%win32\en-us\launcher.msi" (\r
 +    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%\r
 +    if errorlevel 1 exit /B\r
 +)\r
 +\r
 +set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%\r
 +msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true\r
  if errorlevel 1 exit /B\r
 -msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild /p:Platform=%1 %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false\r
 +msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false\r
  if errorlevel 1 exit /B\r
  \r
- msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS%\r
+ if defined BUILDZIP (\r
+     msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS%\r
+     if errorlevel 1 exit /B\r
+ )\r
+ \r
+ if defined BUILDNUGET (\r
+     msbuild "%D%..\nuget\make_pkg.proj" /t:Build /p:Configuration=Release /p:Platform=%1 /p:OutputPath="%BUILD%en-us"\r
+     if errorlevel 1 exit /B\r
+ )\r
  \r
  if not "%OUTDIR%" EQU "" (\r
      mkdir "%OUTDIR%\%OUTDIR_PLAT%"\r
@@@ -197,8 -208,9 +210,9 @@@
  exit /B 0\r
  \r
  :Help\r
- echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--skip-build]\r
- echo                  [--pgo COMMAND] [--skip-pgo] [--skip-doc] [--download DOWNLOAD URL] [--test TARGETDIR]\r
+ echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--pgo COMMAND]\r
 -echo                  [--skip-build] [--skip-doc] [--skip-nuget] [--skip-zip]\r
++echo                  [--skip-build] [--skip-doc] [--skip-nuget] [--skip-zip] [--skip-pgo]\r
+ echo                  [--download DOWNLOAD URL] [--test TARGETDIR]\r
  echo                  [-h]\r
  echo.\r
  echo    --out (-o)          Specify an additional output directory for installers\r
@@@ -207,8 -219,9 +221,11 @@@ echo    -x64                Build x64 i
  echo    --build (-b)        Incrementally build Python rather than rebuilding\r
  echo    --skip-build (-B)   Do not build Python (just do the installers)\r
  echo    --skip-doc (-D)     Do not build documentation\r
 +echo    --pgo               Specify PGO command for x64 installers\r
 +echo    --skip-pgo          Build x64 installers using PGO\r
+ echo    --skip-nuget        Do not build Nuget packages\r
+ echo    --skip-zip          Do not build embeddable package\r
+ echo    --pgo               Build x64 installers using PGO\r
  echo    --download          Specify the full download URL for MSIs\r
  echo    --test              Specify the test directory to run the installer tests\r
  echo    -h                  Display this help information\r