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/components/search/searchresults.js
+++ b/src/components/search/searchresults.js
@ -474,7 +474,7 @@ import 'emby-button';
            showTitle: true,
            overlayText: false,
            centerText: true,
-            action: 'play'
+            overlayPlayButton: true

        });