Merge remote-tracking branch 'origin/develop' into feature/extend-kept-html-tags

; Conflicts:
;	src/routes/api/options.ts
;	src/services/options_init.ts

src/services/html_sanitizer.ts

@@ -60,7 +60,10 @@ function sanitize(dirtyHtml: string) {
             'mumble', 'nfs', 'onenote', 'pop', 'rmi', 's3', 'sftp', 'skype', 'sms', 'spotify', 'steam', 'svn', 'udp',
             'view-source', 'vnc', 'ws', 'wss', 'xmpp', 'jdbc', 'slack'
         ],
-        transformTags,
+        nonTextTags: [
+            'head'
+        ],
+        transformTags
     });
 }