Merge branch 'master' into SteamEngine

Conflicts:
	Cura/slice/__main__.py
	Cura/slice/cura_sf/fabmetheus_utilities/settings.py

diff --cc Cura/gui/preview3d.py
Simple merge

diff --cc Cura/gui/simpleMode.py
Simple merge

diff --cc Cura/gui/util/openglGui.py
index f522311349fd458fe2e8e0f63d0d28233091b700,436fc49041a4709fc33cb9f8d17ee11ad86588d5..a3b9588c10efb2dd54acd45c94b7fa10002630b2
--- 1/Cura/gui/util/openglGui.py
--- 2/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@@ -287,10 -241,10 +287,12 @@@ class glGuiPanel(glcanvas.GLCanvas)
                pass
        def OnMouseMotion(self, e):
                pass
 +      def OnKeyChar(self, keyCode):
 +              pass
        def OnPaint(self, e):
                pass
+       def OnKeyChar(self, keycode):
+               pass
  
        def add(self, ctrl):
                if self._container is not None: