Index: applications/editors/josm/nsis/README.txt
===================================================================
--- applications/editors/josm/nsis/README.txt	(revision 30514)
+++ applications/editors/josm/nsis/README.txt	(revision 30517)
@@ -36,5 +36,5 @@
 1.) You will need to download and install the following on your machine:
 - cygwin bash and wget
-- launch4j - http://launch4j.sourceforge.net/ (currently 3.0.1, older 2.x will NOT work!)
+- launch4j - http://launch4j.sourceforge.net/ (currently 3.4, older 2.x will NOT work!)
 - NSIS - http://nsis.sourceforge.net/ (any recent version should do)
 
Index: applications/editors/josm/nsis/josm.nsi
===================================================================
--- applications/editors/josm/nsis/josm.nsi	(revision 30514)
+++ applications/editors/josm/nsis/josm.nsi	(revision 30517)
@@ -333,5 +333,4 @@
 Section $(JOSM_SEC_DESKTOP_ICON) SecDesktopIcon
 ;-------------------------------------------
-; SectionIn 1 2
 ; Create desktop icon
 ; Desktop icon for a program should not be installed as default!
@@ -341,6 +340,6 @@
 Section $(JOSM_SEC_QUICKLAUNCH_ICON) SecQuickLaunchIcon
 ;-------------------------------------------
-SectionIn 1 2
-; Create quick launch icon
+; Create quick launch icon. Does not really exist as of Windows 7/8 but still advanced users use it.
+; Only disable it by default, see #10241
 CreateShortCut "$QUICKLAUNCH\JOSM.lnk" "$INSTDIR\josm.exe" "" "$INSTDIR\josm.exe" 0 "" "" $(JOSM_LINK_TEXT)
 SectionEnd
Index: applications/editors/josm/nsis/launch4j.xml
===================================================================
--- applications/editors/josm/nsis/launch4j.xml	(revision 30514)
+++ applications/editors/josm/nsis/launch4j.xml	(revision 30517)
@@ -8,5 +8,5 @@
   <chdir></chdir>
   <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
+  <downloadUrl>https://java.com/download</downloadUrl>
   <supportUrl></supportUrl>
   <customProcName>false</customProcName>
@@ -15,9 +15,9 @@
   <jre>
     <path></path>
-    <minVersion>1.6.0</minVersion>
+    <minVersion>1.7.0</minVersion>
     <maxVersion></maxVersion>
     <dontUsePrivateJres>false</dontUsePrivateJres>
-    <initialHeapSize>16</initialHeapSize>
-    <maxHeapSize>512</maxHeapSize>
+    <initialHeapSize>128</initialHeapSize>
+    <maxHeapSize>1024</maxHeapSize>
   </jre>
 </launch4jConfig>