Merge fix.

diff --cc Cura/gui/printWindow.py
index 5d03f43b2dc427d20da2e016f27f971ceb07cd7a,0591649fbac104797e6d34ce5c1bdbce203d5b89..13a1b6cbdd85066bea07dc49152dfb7c15e4a7a1
--- 1/Cura/gui/printWindow.py
--- 2/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@@ -528,11 -528,10 +528,12 @@@ class printWindow(wx.Frame)
                self.machineCom.setFeedrateModifier('SUPPORT', self.supportSpeedSelect.GetValue() / 100.0)
  
        def AddTermLog(self, line):
 +              if len(self.termLog.GetValue()) > 10000:
 +                      self.termLog.SetValue(self.termLog.GetValue()[-10000:])
+               self.termLog.SetInsertionPointEnd()
                self.termLog.AppendText(unicode(line, 'utf-8', 'replace'))
-               l = len(self.termLog.GetValue())
-               self.termLog.SetCaret(wx.Caret(self.termLog, (l, l)))
+               #l = self.termLog.GetLastPosition()     # if needed (windows? mac?)
+               #self.termLog.ShowPosition(l)
  
        def OnTermEnterLine(self, e):
                line = self.termInput.GetValue()