Merge branch 'master' into 'task_languageCleanup'

# Conflicts:
#   Classes/Service/MailTemplateService.php

composer.json

@@ -6,7 +6,7 @@
     "license": [
         "GPL-2.0-or-later"
     ],
-    "version": "6.0.9",
+    "version": "6.0.10",
     "repositories": [
         {
             "type": "composer",

ext_emconf.php

@@ -8,7 +8,7 @@ $EM_CONF['sg_mail'] = [
 	'title' => 'Mail Templates',
 	'description' => 'Mail Templates',
 	'category' => 'module',
-	'version' => '6.0.9',
+	'version' => '6.0.10',
 	'state' => 'stable',
 	'uploadfolder' => FALSE,
 	'createDirs' => '',