Get the Windows build to obey the build type and specify the correct location of the exes.
Merge commit '7c64bab29d219d95599821bd800015f0a8a03386'