Merge pull request #475 from Salandora/master

Bug fix for Emergency Stop

src/octoprint/util/comm.py

@@ -1018,6 +1018,9 @@ class MachineCom(object):
 		self._resendDelta = None
 
 		return None
+	def _gcode_M112(self, cmd): # It's an emergency what todo? Canceling the print should be the minimum
+		self.cancelPrint()
+		return cmd
 
 ### MachineCom callback ################################################################################################