Merge branch 'maintenance' into devel

Conflicts:
	src/octoprint/static/css/octoprint.css

AUTHORS.md

@@ -57,6 +57,8 @@ date of first contribution):
   * [Marcel Hellwig](https://github.com/punkkeks)
   * [Kevin Murphy](https://github.com/kevingelion)
   * [Richard Joyce](https://github.com/richjoyce)
+  * ["bwgan"](https://github.com/bwgan)
+  * [Siim Raud](https://github.com/2ndalpha)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and

src/octoprint/plugins/cura/profile.py

@@ -31,6 +31,11 @@ class MachineShapeTypes(object):
 	SQUARE = "square"
 	CIRCULAR = "circular"
 
+class RetractionCombingTypes(object):
+	OFF = "off"
+	ALL = "all"
+	NO_SKIN = "no skin"
+
 class GcodeFlavors(object):
 	REPRAP = (0, "reprap")
 	ULTIGCODE = (1, "ultigcode")
@@ -390,6 +395,11 @@ class Profile(object):
 				"Both": SupportDualTypes.BOTH,
 				"First extruder": SupportDualTypes.FIRST,
 				"Second extruder": SupportDualTypes.SECOND
+			},
+			retraction_combing={
+				"Off": RetractionCombingTypes.OFF,
+				"All": RetractionCombingTypes.ALL,
+				"No Skin": RetractionCombingTypes.NO_SKIN
 			}
 		)
 
@@ -911,7 +921,7 @@ class Profile(object):
 			"retractionAmountExtruderSwitch": self.get_microns("retraction_dual_amount"),
 			"retractionZHop": self.get_microns("retraction_hop"),
 			"minimalExtrusionBeforeRetraction": self.get_microns("retraction_minimal_extrusion"),
-			"enableCombing": 1 if self.get_boolean("retraction_combing") else 0,
+			"enableCombing": 1 if self.get("retraction_combing") == RetractionCombingTypes.ALL else (2 if self.get("retraction_combing") == RetractionCombingTypes.NO_SKIN else 0),
 			"multiVolumeOverlap": self.get_microns("overlap_dual"),
 			"objectSink": max(0, self.get_microns("object_sink")),
 			"minimalLayerTime": self.get_int("cool_min_layer_time"),