Used a env variable to locate program files (x86) folder for nsis
Merge remote-tracking branch 'upstream/master'