diff --git a/.hgtags b/.hgtags
index 3ab14e79d97061919983950851397991b474c498..57b38bca53a345c50b6a05ca259b3d1bdbe5390d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,3 +69,4 @@ c153549f29242341b62b8a326638daea237093e3 OpenOLAT 9.0.6
 cee7299c2b62edf89f6164ab81f3b785a234f95b OpenOLAT 9.3.2
 4b1f3cb4957afcae660aa0823fa96aedf55a9382 OpenOLAT 9.3.3
 4e992c6a31e099192c90eb5f364950bd34cc7741 OpenOLAT 9.3.4
+3e4c2cc8495ac15f4af7397382655cfee1420336 OpenOLAT 9.3.5
diff --git a/src/main/java/org/olat/core/gui/components/table/DefaultXlsTableExporter.java b/src/main/java/org/olat/core/gui/components/table/DefaultXlsTableExporter.java
index 64c044f99407de9da0fa673c2818cc4a3920b06c..dca25e41bb303fb8e3b8a0a6e2b2f08707477ceb 100644
--- a/src/main/java/org/olat/core/gui/components/table/DefaultXlsTableExporter.java
+++ b/src/main/java/org/olat/core/gui/components/table/DefaultXlsTableExporter.java
@@ -36,6 +36,7 @@ import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.WorkbookUtil;
 import org.olat.core.gui.media.CleanupAfterDeliveryFileMediaResource;
 import org.olat.core.gui.media.MediaResource;
 import org.olat.core.gui.render.StringOutput;
@@ -71,7 +72,8 @@ public class DefaultXlsTableExporter implements TableExporter {
 		headerCellStyle = getHeaderCellStyle(wb);
 		
 		String tableExportTitle = translator.translate("table.export.title");
-		Sheet exportSheet = wb.createSheet(tableExportTitle);
+		String saveTitle = WorkbookUtil.createSafeSheetName(tableExportTitle);
+		Sheet exportSheet = wb.createSheet(saveTitle);
 		createHeader(table, translator, cdcnt, exportSheet);
 		createData(table, cdcnt, rcnt, exportSheet);
 		
diff --git a/src/main/java/org/olat/course/db/CustomDBController.java b/src/main/java/org/olat/course/db/CustomDBController.java
index f108b007b17b5ddf3e6194dab9c2f61ee3bc288b..177293d447fc6d7434b3a84f927ce53bd8a0f8d6 100644
--- a/src/main/java/org/olat/course/db/CustomDBController.java
+++ b/src/main/java/org/olat/course/db/CustomDBController.java
@@ -32,6 +32,7 @@ import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.WorkbookUtil;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
@@ -264,7 +265,8 @@ public class CustomDBController extends FormBasicController {
 
 		Workbook wb = new HSSFWorkbook();
 		CellStyle headerCellStyle = getHeaderCellStyle(wb);
-		Sheet exportSheet = wb.createSheet(courseTitle);
+		String saveTitle = WorkbookUtil.createSafeSheetName(courseTitle);
+		Sheet exportSheet = wb.createSheet(saveTitle);
 		
 		//create the headers
 		Row headerRow = exportSheet.createRow(0);
diff --git a/src/main/java/org/olat/ims/qti/editor/beecom/objects/ChoiceQuestion.java b/src/main/java/org/olat/ims/qti/editor/beecom/objects/ChoiceQuestion.java
index 549793ae1622c80a9841ce31eadf201f527607d2..edc1b82475ff2ba7b60073b1b02641b4f30abc97 100644
--- a/src/main/java/org/olat/ims/qti/editor/beecom/objects/ChoiceQuestion.java
+++ b/src/main/java/org/olat/ims/qti/editor/beecom/objects/ChoiceQuestion.java
@@ -132,9 +132,6 @@ public class ChoiceQuestion extends Question implements QTIObject {
 					}
 				}
 				
-				// set min/max score first has it can be overridden
-				QTIEditHelper.configureMinMaxScore(instance, (Element) resprocessingXML.selectSingleNode(".//decvar"));
-
 				// get type of multiple choice
 				if (instance.getType() == TYPE_MC) {
 					// if does not contain any ANDs, assume only one combination
@@ -146,7 +143,9 @@ public class ChoiceQuestion extends Question implements QTIObject {
 					} else {
 						instance.setSingleCorrect(false);
 					}
+					QTIEditHelper.configureMinMaxScore(instance, (Element) resprocessingXML.selectSingleNode(".//decvar"));
 				} else if (instance.getType() == TYPE_SC) {
+					QTIEditHelper.configureMinMaxScore(instance, (Element) resprocessingXML.selectSingleNode(".//decvar"));
 					Collection<Float> values = points.values();
 					if (values.size() > 0) {
 						instance.setSingleCorrect(true);
@@ -178,6 +177,9 @@ public class ChoiceQuestion extends Question implements QTIObject {
 							choice.setPoints(maxValue / 4);
 						}
 					}
+					QTIEditHelper.configureMinMaxScore(instance, (Element) resprocessingXML.selectSingleNode(".//decvar"));
+				} else {
+					QTIEditHelper.configureMinMaxScore(instance, (Element) resprocessingXML.selectSingleNode(".//decvar"));
 				}
 
 					
diff --git a/src/main/java/org/olat/instantMessaging/manager/ChatLogHelper.java b/src/main/java/org/olat/instantMessaging/manager/ChatLogHelper.java
index f529a98d040c1ae22628347c77f0eb6b0acd870a..df1157352f2584142c196594c689febbbff96afb 100644
--- a/src/main/java/org/olat/instantMessaging/manager/ChatLogHelper.java
+++ b/src/main/java/org/olat/instantMessaging/manager/ChatLogHelper.java
@@ -38,6 +38,7 @@ import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.WorkbookUtil;
 import org.olat.basesecurity.IdentityImpl;
 import org.olat.core.gui.media.MediaResource;
 import org.olat.core.gui.media.WorkbookMediaResource;
@@ -115,7 +116,8 @@ public class ChatLogHelper {
 
 		Workbook wb = new HSSFWorkbook();
 		String tableExportTitle = translator.translate("logChat.export.title");
-		Sheet exportSheet = wb.createSheet(tableExportTitle);
+		String saveTitle = WorkbookUtil.createSafeSheetName(tableExportTitle);
+		Sheet exportSheet = wb.createSheet(saveTitle);
 		Formatter formatter = Formatter.getInstance(locale);
 		
 		//headers
diff --git a/src/main/webapp/static/movie/player.js b/src/main/webapp/static/movie/player.js
index 44fb6142955e82f5faa18f49c6c88e7fa3e73bf4..972144c48e259f62c18289d98c50589cd5fa5c72 100644
--- a/src/main/webapp/static/movie/player.js
+++ b/src/main/webapp/static/movie/player.js
@@ -74,7 +74,7 @@ var BPlayer = {
 			args.controlbar = "none";
 		}
 		
-		if(BPlayer.isIE8() && domId != 'prev_container') {
+		if(BPlayer.isIE8() && domId != 'prev_container' && jQuery('#' + domId).is("span")) {
 			var spanEl = jQuery('#' + domId);
 			var width = spanEl.width();
 			var height = spanEl.height();