Merge remote-tracking branch 'arduino/master'

Author: cmaglie

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -177,6 +177,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       Thread.sleep(100);
     }
 
+    BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
+    try {
+      prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
+    } catch (Exception e) {
+      // if serial port does not contain an iserial field
+    }
+
     prefs.put("build.path", buildPath);
     prefs.put("build.project_name", className);
     if (verbose) {