Index: scripts/jenkins/prepare-portable-package.bat
===================================================================
diff -u -r149fdfa68396ce70ada4e3021950f2ad4fbb3e88 -rfae17003209647179c34df595f88808f18d9cad2
--- scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision 149fdfa68396ce70ada4e3021950f2ad4fbb3e88)
+++ scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision fae17003209647179c34df595f88808f18d9cad2)
@@ -5,8 +5,6 @@
 
 SET TmpDir=%WORKSPACE%\temp\chzip-%BUILD_NUMBER%
 
-SET VSInstallDirX86=C:\Program Files (x86)\Microsoft Visual Studio 14.0
-
 mkdir "%TmpDir%"
 
 rem Prepare 32bit build
Index: scripts/setup.iss
===================================================================
diff -u -rfc8216e6433b4477e185aaba8121a093ad021cef -rfae17003209647179c34df595f88808f18d9cad2
--- scripts/setup.iss	(.../setup.iss)	(revision fc8216e6433b4477e185aaba8121a093ad021cef)
+++ scripts/setup.iss	(.../setup.iss)	(revision fae17003209647179c34df595f88808f18d9cad2)
@@ -164,15 +164,14 @@
 Name: {group}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; WorkingDir: {app}
 Name: {group}\{cm:TranslateCopyHandler}; Filename: {app}\{code:ExpandArch|ICTranslateFilename}; Parameters: """{app}\langs\english.lng"""; WorkingDir: {app}\lang
 Name: {group}\{cm:UninstallCopyHandler}; Filename: {uninstallexe}; WorkingDir: {app}
-Name: {userdesktop}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: desktopicon; WorkingDir: {app}
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: quicklaunchicon; WorkingDir: {app}
+Name: {commondesktop}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: desktopicon; WorkingDir: {app}
+Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: quicklaunchicon; WorkingDir: {app}
 
 [Run]
 Filename: "{app}\{code:ExpandArch|ExeFilename}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#MyAppName}}"
 
 [Registry]
 Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: none; ValueName: "Copy Handler"; Flags: deletevalue uninsdeletevalue
-Root: "HKCU"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: none; ValueName: "Copy Handler"; Flags: uninsdeletevalue
 
 [Dirs]
 Name: {app}\help; Flags: uninsalwaysuninstall