Merge branch 'master' into devel

Conflicts:
	src/octoprint/server/ajax/control.py

CONTRIBUTING.md

@@ -0,0 +1,13 @@
+Bug Reports
+-----------
+
+**READ [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!**.
+
+Pull Requests
+-------------
+
+1. Please create all pull requests against the `devel` branch.
+2. Create **one pull request per feature/bug fix**.
+3. Create a custom branch for your feature/bug fix and use that as base for your pull request. Pull requests directly against your version of `devel` will be closed.
+4. In your pull request's description, state what your pull request is doing, as in, what feature does it implement, what bug does it fix.
+

src/octoprint/util/comm.py

@@ -1220,6 +1220,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
 
 	def _gcode_M112(self, cmd): # It's an emergency what todo? Canceling the print should be the minimum
 		self.cancelPrint()
@@ -1468,4 +1471,4 @@ class StreamingGcodeFileInformation(PrintingGcodeFileInformation):
 		return self._localFilename
 
 	def getRemoteFilename(self):
-		return self._remoteFilename
+		return self._remoteFilename