Merge branch 'master' into develop

# Conflicts:
#	changelog.md
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	readme.md
#	yarn.lock

demo/dist/demo.js

@@ -4326,33 +4326,7 @@ typeof navigator === "object" && (function () {
 
 	  if (env.prod) {
 	    singleton.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install();
-	  } // Google analytics
-	  // For demo site (https://plyr.io) only
-
-	  /* eslint-disable */
-
-
-	  if (env.prod) {
-	    (function (i, s, o, g, r, a, m) {
-	      i.GoogleAnalyticsObject = r;
-
-	      i[r] = i[r] || function () {
-	        (i[r].q = i[r].q || []).push(arguments);
-	      };
-
-	      i[r].l = 1 * new Date();
-	      a = s.createElement(o);
-	      m = s.getElementsByTagName(o)[0];
-	      a.async = 1;
-	      a.src = g;
-	      m.parentNode.insertBefore(a, m);
-	    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-
-	    window.ga('create', 'UA-40881672-11', 'auto');
-	    window.ga('send', 'pageview');
 	  }
-	  /* eslint-enable */
-
 	})();
 
 }());

demo/index.html

@@ -33,7 +33,11 @@
         <meta name="twitter:card" content="summary_large_image" />
 
         <!-- Docs styles -->
+<<<<<<< HEAD
         <link rel="stylesheet" href="dist/demo.css?v=2" />
+=======
+        <link rel="stylesheet" href="dist/demo.css?2" />
+>>>>>>> master
 
         <!-- Preload -->
         <link
@@ -270,7 +274,11 @@
 
         <!-- Polyfills -->
         <script
+<<<<<<< HEAD
             src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL,Math.trunc"
+=======
+            src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL"
+>>>>>>> master
             crossorigin="anonymous"
         ></script>
 
@@ -284,6 +292,21 @@
         <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script>
 
         <!-- Docs script -->
+<<<<<<< HEAD
         <script src="dist/demo.js" crossorigin="anonymous"></script>
+=======
+        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script>
+        <script>
+            if (window.location.host === 'plyr.io') {
+                window.dataLayer = window.dataLayer || [];
+                function gtag() {
+                    window.dataLayer.push(arguments);
+                }
+                gtag('js', new Date());
+                gtag('config', 'UA-132699580-1');
+            }
+        </script>
+        <script src="dist/demo.js?2" crossorigin="anonymous"></script>
+>>>>>>> master
     </body>
 </html>

demo/src/js/demo.js

@@ -283,27 +283,4 @@ import Raven from 'raven-js';
     if (env.prod) {
         Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install();
     }
-
-    // Google analytics
-    // For demo site (https://plyr.io) only
-    /* eslint-disable */
-    if (env.prod) {
-        ((i, s, o, g, r, a, m) => {
-            i.GoogleAnalyticsObject = r;
-            i[r] =
-                i[r] ||
-                function() {
-                    (i[r].q = i[r].q || []).push(arguments);
-                };
-            i[r].l = 1 * new Date();
-            a = s.createElement(o);
-            m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m);
-        })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-        window.ga('create', 'UA-40881672-11', 'auto');
-        window.ga('send', 'pageview');
-    }
-    /* eslint-enable */
 })();