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

With conflicts

src/elements/emby-textarea/emby-textarea.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import layoutManager from 'layoutManager';
 import browser from 'browser';
 import 'css!./emby-textarea';
@@ -5,6 +6,10 @@ import 'registerElement';
 import 'emby-input';
 
 /* eslint-disable indent */
+=======
+define(['layoutManager', 'browser', 'css!./emby-textarea', 'webcomponents', 'emby-input'], function (layoutManager, browser) {
+    'use strict';
+>>>>>>> upstream/master
 
     function autoGrow(textarea, maxLines) {
         const self = this;