Merge tag '15.01-RC1' into upstream

Conflicts:
	Cura/util/sliceEngine.py

diff --cc Cura/util/sliceEngine.py
index d1b49ec4442bbaccdf44f680c63386e13da7de7b,2678c69f831bf8eaf33f242a5e7f2d35a4e3aa4d..e19b1a7413ee630b5c6b0182a96227fe0c27267f
--- 1/Cura/util/sliceEngine.py
--- 2/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@@ -287,6 -287,17 +287,17 @@@ class Engine(object)
        def runEngine(self, scene):
                if len(scene.objects()) < 1:
                        return
 -              self._thread = threading.Thread(target=self._runEngine, args=(scene, self._thread))
++              self._thread = threading.Thread(target=self._runEngine, args=(scene, self._thread, pluginInfo.getPostProcessPluginConfig()))
+               self._thread.daemon = True
+               self._thread.start()
+ 
 -      def _runEngine(self, scene, old_thread):
++      def _runEngine(self, scene, old_thread, pluginConfig):
+               if old_thread is not None:
+                       if self._process is not None:
+                               self._process.terminate()
+                       old_thread.join()
+               self._callback(-1.0)
+ 
                extruderCount = 1
                for obj in scene.objects():
                        if scene.checkPlatform(obj):

diff --cc package.sh
index c16205b3611826a476950f74be4fe4e1c3888323,1dd7b7354a2c5d4b187817ac0185887aac087bf9..72557fc6bc1364fb03416d1f3244224bf8b931b0
--- 1/package.sh
--- 2/package.sh
+++ b/package.sh
@@@ -19,15 -19,9 +19,15 @@@ BUILD_TARGET=${1:-none
  ##Do we need to create the final archive
  ARCHIVE_FOR_DISTRIBUTION=1
  ##Which version name are we appending to the final archive
- export BUILD_NAME=14.12
+ export BUILD_NAME=15.01-RC1
  TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
  
 +##Revision
 +export REVISION=1.19
 +
 +##Git commit
 +GIT_HASH=$(git rev-parse --short=4 HEAD)
 +
  ##Which versions of external programs to use
  WIN_PORTABLE_PY_VERSION=2.7.2.1