Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks

Author: msmith-techempower

toolset/setup/windows/installer.ps1

@@ -11,8 +11,8 @@ $wincache_installer_file  = "wincache-1.3.4-5.4-nts-vc9-x86.exe"
 $wincache_installer_path  = "wincache-1.3.4/$wincache_installer_file"
 $go_installer_file        = "go1.1.1.windows-amd64.msi"
 $jre_installer_file       = "jre-7u25-windows-x64.exe"
-$jdk_installer_file       = "jdk-7u40-windows-x64.exe"
-$jdk_master_hash          = "7412ccc2ac8a0f418eb58c5f170742a3" 
+$jdk_installer_file       = "jdk-7u45-windows-x64.exe"
+$jdk_master_hash          = "943527ed9111cbb746d4ab2bb2c31cd6" 
 # http://www.oracle.com/technetwork/java/javase/downloads/java-se-binaries-checksum-1956892.html
 $resin_version            = "resin-4.0.36"
 $resin_installer_file     = "$resin_version.zip"