Merge remote-tracking branch 'upstream/dev' into dev

setup/windows/build.ps1

@@ -165,20 +165,19 @@ if ($MyInvocation.InvocationName -ne ".") {
   foreach ($Arch in @("32", "64")) {
     Write-Host "Extracting: Python (x$Arch)"
     $Files = @(
-      "Pygments",
+      "Pygments.whl",
       "certifi.whl",
       "chardet.whl",
       "docopt.whl",
       "idna.whl",
       "mariadb$Arch.whl",
-      "pytz.whl",
-      "prompt_toolkit",
+      "prompt_toolkit.whl",
       "psutil$Arch.whl",
       "python$Arch.zip",
       "pytz.whl",
       "requests.whl",
       "urllib3.whl",
-      "wcwidth"
+      "wcwidth.whl"
     )
     try {
       foreach ($File in $Files) {