Merge branch 'wix-prevent-nsis-overwrite' into release