Select correct %PROGRAMFILES% based on Win32 vs Win64 in sh.cmd
Merge pull request #594 from jan76/winbuild

Select correct %PROGRAMFILES% based on Win32 vs Win64 in sh.cmd
Merge remote-tracking branch 'upstream/next' into next