Merge remote-tracking branch 'upstream/master' into es6

With conflicts
2020-07-24 10:23:14 +02:00 · 2020-07-24 10:23:14 +02:00 · 3713091382
commit 3713091382
parent 41c94463bb 6b45755480
165 changed files with 4194 additions and 2714 deletions
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@ -1,7 +1,12 @@
+<<<<<<< HEAD
 import browser from 'browser';
 import 'css!./emby-collapse';
 import 'registerElement';
 import 'emby-button';
+=======
+define(['browser', 'css!./emby-collapse', 'webcomponents', 'emby-button'], function (browser) {
+    'use strict';
+>>>>>>> upstream/master

 /* eslint-disable indent */