Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6949)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6950)
@@ -1280,5 +1280,7 @@
         // Workaround to fix a Java "feature"
         // See http://stackoverflow.com/q/7615645/2257172 and #9875
-        updateSystemProperty("jsse.enableSNIExtension", "false");
+        if (getBoolean("jdk.tls.disableSNIExtension", true)) {
+            updateSystemProperty("jsse.enableSNIExtension", "false");
+        }
         // Workaround to fix another Java bug
         // Force Java 7 to use old sorting algorithm of Arrays.sort (fix #8712).