Merge tag '15.01-RC2' into upstream

diff --cc Cura/util/sliceEngine.py
Simple merge

diff --cc package.sh
index 72557fc6bc1364fb03416d1f3244224bf8b931b0,5234e64af68827e625c4864960a2f5c6b5014985..17a06cdb7d7769fd6c2b8f852558c73f75f16fbf
--- 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=15.01-RC1
+ export BUILD_NAME=15.01-RC2
  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