Merge branch 'master' into feature-backup-manager

* master:
  Still raise exception when loading incorrect material file

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -540,8 +540,7 @@ class XmlMaterialProfile(InstanceContainer):
 
         validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data)
         if validation_message is not None:
-            return
-            # raise Exception("Not valid material profile: %s" % (validation_message))
+            raise Exception("Not valid material profile: %s" % (validation_message))
 
         property_values = {}
         properties = data.iterfind("./um:properties/*", self.__namespaces)