diff --git a/.gitignore b/.gitignore
index 4f3d583204..b818b145b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ test/coverage/*
 .sass-cache
 
 dist/*
+
+.idea/
diff --git a/.travis.yml b/.travis.yml
index e50c470324..2b9c01e399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,3 +23,5 @@ sudo: false
 cache:
   directories:
     - node_modules
+addons:
+  firefox: latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7092a227a6..c3ff336a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,95 @@ _(none)_
 
 --------------------
 
+## 5.9.2 (2016-04-19)
+* @gkatsev grouped text track errors in the console, if we can ([view](https://github.com/videojs/video.js/pull/3259))
+
+## 5.9.1 (2016-04-19)
+* @benjipott updated IS_CHROME to not be true on MS Edge ([view](https://github.com/videojs/video.js/pull/3232))
+* @mister-ben blacklisted Chrome for Android for playback rate support ([view](https://github.com/videojs/video.js/pull/3246))
+* @gkatsev made the first emulated text track enabled by default ([view](https://github.com/videojs/video.js/pull/3248))
+* @gkatsev fixed removeRemoteTextTracks not working with return value from addRemoteTextTracks ([view](https://github.com/videojs/video.js/pull/3253))
+* @forbesjo added back the background color to the poster ([view](https://github.com/videojs/video.js/pull/3267))
+* @gkatsev fixed text track tests for older IEs ([view](https://github.com/videojs/video.js/pull/3269))
+
+## 5.9.0 (2016-04-05)
+* @gkatsev updated vjs to not add dynamic styles when VIDEOJS_NO_DYNAMIC_STYLE is set ([view](https://github.com/videojs/video.js/pull/3093))
+* @OwenEdwards added basic descriptions track support ([view](https://github.com/videojs/video.js/pull/3098))
+* @kamilbrenk Added lang
+* @arius28 added greek translation file (el.json) ([view](https://github.com/videojs/video.js/pull/3185))
+* @ricardosiri68 changed the relative sass paths ([view](https://github.com/videojs/video.js/pull/3147))
+* @gkatsev added an option to keep the tooltips inside the player bounds ([view](https://github.com/videojs/video.js/pull/3149))
+* @defli added currentWidth and currentHeight methods to the player ([view](https://github.com/videojs/video.js/pull/3144))
+* fix IE8 tests for VIDEOJS_NO_DYNAMIC_STYLE ([view](https://github.com/videojs/video.js/pull/3215))
+* @OwenEdwards fixed links adding extra tab stop with IE by removing anchor tags on videojs init ([view](https://github.com/videojs/video.js/pull/3194))
+* @scaryguy updated videojs cdn urls in the README ([view](https://github.com/videojs/video.js/pull/3195))
+* @mister-ben updated the time tooltips to use the chosen font family ([view](https://github.com/videojs/video.js/pull/3213))
+* @OwenEdwards improved handling of deprecated use of Button component ([view](https://github.com/videojs/video.js/pull/3236))
+* @forbesjo added chrome for PR tests ([view](https://github.com/videojs/video.js/pull/3235))
+* @MCGallaspy added vttjs to the self-hosting guide ([view](https://github.com/videojs/video.js/pull/3229))
+* @chrisauclair added ARIA region and label to player element ([view](https://github.com/videojs/video.js/pull/3227))
+* @andyearnshaw updated document event handlers to use el.ownerDocument ([view](https://github.com/videojs/video.js/pull/3230))
+
+## 5.8.8 (2016-04-04)
+* @vtytar fixed auto-setup failing if taking too long to load ([view](http://github.com/videojs/video.js/pull/3233))
+* @seescode fixed css failing on IE8 due to incorrect ie8 hack ([view](http://github.com/videojs/video.js/pull/3226))
+* @seescode fixed dragging on mute toggle changing the volume ([view](http://github.com/videojs/video.js/pull/3228))
+
+## 5.8.7 (2016-03-29)
+* @llun fixed menus from throwing when focused when empty ([view](https://github.com/videojs/video.js/pull/3218))
+* @mister-ben added dir=ltr to control bar and loading spinner ([view](https://github.com/videojs/video.js/pull/3221))
+* @avreg fixed notSupportedMessage saying video when meaning media ([view](https://github.com/videojs/video.js/pull/3222))
+* @mister-ben fixed missing native HTML5 tracks ([view](https://github.com/videojs/video.js/pull/3212))
+* @mister-ben updated Arabic language files ([view](https://github.com/videojs/video.js/pull/3225))
+
+## 5.8.6 (2016-03-25)
+* @misteroneill fixed typo and indenting in language files ([view](https://github.com/videojs/video.js/pull/3207))
+
+## 5.8.5 (2016-03-17)
+* @gkatsev cleared vttjs script handlers on dispose. Fixed tests ([view](https://github.com/videojs/video.js/pull/3189))
+
+## 5.8.4 (2016-03-17)
+* @gkatsev changed emulated tracks to in novtt to wait for vttjs to load or error before parsing ([view](https://github.com/videojs/video.js/pull/3181))
+
+## 5.8.3 (2016-03-10)
+* @gkatsev fixed keyboard control of menus with titles. Fixes #3164 ([view](https://github.com/videojs/video.js/pull/3165))
+
+## 5.8.2 (2016-03-09)
+* @gkatsev fixed chapters menu. Fixes #3062 ([view](https://github.com/videojs/video.js/pull/3163))
+
+## 5.8.1 (2016-03-07)
+* @gkatsev updated videojs badges in the README ([view](https://github.com/videojs/video.js/pull/3134))
+* @BrandonOCasey converted remaining text-track modules to ES6 ([view](https://github.com/videojs/video.js/pull/3130))
+* @gkatsev cleared waiting/spinner on timeupdate. Fixes #3124 ([view](https://github.com/videojs/video.js/pull/3138))
+* @BrandonOCasey updated text track unit tests to use full es6 syntax ([view](https://github.com/videojs/video.js/pull/3148))
+* @defli added missing var to sandbox index.html example ([view](https://github.com/videojs/video.js/pull/3155))
+* @defli fixed typo and updated Turkish translations ([view](https://github.com/videojs/video.js/pull/3156))
+* @OwenEdwards fixed menu closing on ios, specifically ipad ([view](https://github.com/videojs/video.js/pull/3158))
+
+## 5.8.0 (2016-02-19)
+* @gkatsev added issue and PR templates for github ([view](https://github.com/videojs/video.js/pull/3117))
+* @Nipoto added fa.json (farsi/persian lang file) ([view](https://github.com/videojs/video.js/pull/3116))
+* @forbesjo updated travis to use latest firefox ([view](https://github.com/videojs/video.js/pull/3112))
+* @Naouak updated time display to not change if values do not change ([view](https://github.com/videojs/video.js/pull/3101))
+* @forbesjo updated track settings to not fail restoring settings when localStorage is not available ([view](https://github.com/videojs/video.js/pull/3120))
+* @mister-ben Added en.json as localization template ([view](https://github.com/videojs/video.js/pull/3096))
+* @misteroneill added alt css as video-js-cdn.css ([view](https://github.com/videojs/video.js/pull/3118))
+
+## 5.7.1 (2016-02-11)
+* @alex-phillips fixed reference to videojs-vtt.js dependency ([view](https://github.com/videojs/video.js/pull/3080))
+* @gkatsev fixed minified videojs in IE8. Fixes #3064 and #3070 ([view](https://github.com/videojs/video.js/pull/3104))
+
+## 5.7.0 (2016-02-04)
+* @forbesjo updated emulated tracks to have listeners removed when they are removed ([view](https://github.com/videojs/video.js/pull/3046))
+* @incompl improved the UX of time tooltips ([view](https://github.com/videojs/video.js/pull/3060))
+* @gkatsev updated README to include links to plugins page and getting started and cleaner link to LICENSE ([view](https://github.com/videojs/video.js/pull/3066))
+* @hartman Corrected adaptive layout selectors to match their intent ([view](https://github.com/videojs/video.js/pull/2923))
+* @mister-ben updated Umuted to Unmute in lang files ([view](https://github.com/videojs/video.js/pull/3053))
+* @hartman updated fullscreen and time controls for more consistent widths ([view](https://github.com/videojs/video.js/pull/2893))
+* @hartman Set a min-width for the progress slider of 4em ([view](https://github.com/videojs/video.js/pull/2902))
+* @misteroneill fixed iphone useragent detection ([view](https://github.com/videojs/video.js/pull/3077))
+* @erikyuzwa added ability to add child component at specific index ([view](https://github.com/videojs/video.js/pull/2540))
+
 ## 5.6.0 (2016-01-26)
 * @OwenEdwards added ClickableComponent. Fixed keyboard operation of buttons ([view](https://github.com/videojs/video.js/pull/3032))
 * @OwenEdwards Fixed menu keyboard access and ARIA labeling for screen readers ([view](https://github.com/videojs/video.js/pull/3033))
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..b125eb645b
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,32 @@
+## Description
+Briefly describe the issue.
+Include a [reduced test case](https://css-tricks.com/reduced-test-cases/), we have a [starter template](http://jsbin.com/axedog/edit?html,output) on JSBin you can use.
+
+## Steps to reproduce
+Explain in detail the exact steps necessary to reproduce the issue.
+
+1.
+2.
+3.
+
+## Results
+### Expected
+Please describe what you expected to see.
+
+### Actual
+Please describe what actually happened.
+
+### Error output
+If there are any errors at all, please include them here.
+
+## Additional Information
+Please include any additional information necessary here. Including the following:
+### versions
+#### videojs
+what version of videojs does this occur with?
+#### browsers
+what browser are affected?
+#### OSes
+what platforms (operating systems and devices) are affected?
+### plugins
+are any videojs plugins being used on the page? If so, please list them below.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..774e61c179
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+## Description
+Please describe the change as necessary.
+If it's a feature or enhancement please be as detailed as possible.
+If it's a bug fix, please link the issue that it fixes or describe the bug in as much detail.
+
+
+## Specific Changes proposed
+Please list the specific changes involved in this pull request.
+
+## Requirements Checklist
+- [ ] Feature implemented / Bug fixed
+- [ ] If necessary, more likely in a feature request than a bug fix
+  - [ ] Unit Tests updated or fixed
+  - [ ] Docs/guides updated
+  - [ ] Example created ([starter template on JSBin](http://jsbin.com/axedog/edit?html,output))
+- [ ] Reviewed by Two Core Contributors
diff --git a/README.md b/README.md
index c87859f325..b83e0c346b 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,26 @@
 ![Video.js logo](http://videojs.com/img/logo.png)
 
-# [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
+# [Video.js - HTML5 Video Player](http://videojs.com)
+[![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
+[![Coverage Status](https://coveralls.io/repos/github/videojs/video.js/badge.svg?branch=master)](https://coveralls.io/github/videojs/video.js?branch=master)
+
+[![NPM](https://nodei.co/npm/video.js.png?downloads=true&downloadRank=true)](https://nodei.co/npm/video.js/)
 
 > Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ ~~100,000~~ 200,000 websites.
 
 ## Quick start
-Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use. Simply add these includes to your document's
+Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use.
+Also, check out the [Getting Started](http://videojs.com/getting-started/) page on our website which has the latest urls as well.
+Simply add these includes to your document's
 `<head>`:
 
 ```html
-<link href="//vjs.zencdn.net/5.0/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/5.0/video.min.js"></script>
+<link href="//vjs.zencdn.net/5.8/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/5.8/video.min.js"></script>
 ```
 
 Then, whenever you want to use Video.js you can simply use the `<video>` element as your normally would, but with an additional `data-setup` attribute containing any Video.js options. These options
-can include any Video.js option plus potential [plugin](https://github.com/videojs/video.js/wiki/Plugins) options, just make sure they're valid JSON!
+can include any Video.js option plus potential [plugin](http://videojs.com/plugins/) options, just make sure they're valid JSON!
 
 ```html
 <video id="really-cool-video" class="video-js vjs-default-skin" controls
@@ -55,5 +61,3 @@ To build your own custom version read the section on [contributing code](CONTRIB
 ## License
 
 Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)
-
-Copyright 2014-2015 Brightcove, Inc.
diff --git a/build/grunt.js b/build/grunt.js
index 0ced6c7bde..4c3d2ab808 100644
--- a/build/grunt.js
+++ b/build/grunt.js
@@ -149,6 +149,14 @@ module.exports = function(grunt) {
     },
     dist: {},
     watch: {
+      novtt: {
+        files: ['build/temp/video.js'],
+        tasks: ['concat:novtt']
+      },
+      minify: {
+        files: ['build/temp/video.js'],
+        tasks: ['uglify']
+      },
       skin: {
         files: ['src/css/**/*'],
         tasks: ['sass', 'wrapcodepoints']
@@ -188,7 +196,7 @@ module.exports = function(grunt) {
       minify: {
         expand: true,
         cwd: 'build/temp/',
-        src: ['video-js.css'],
+        src: ['video-js.css', 'alt/video-js-cdn.css'],
         dest: 'build/temp/',
         ext: '.min.css'
       }
@@ -196,7 +204,8 @@ module.exports = function(grunt) {
     sass: {
       build: {
         files: {
-          'build/temp/video-js.css': 'src/css/vjs.scss'
+          'build/temp/video-js.css': 'src/css/vjs.scss',
+          'build/temp/alt/video-js-cdn.css': 'src/css/vjs-cdn.scss'
         }
       }
     },
@@ -396,7 +405,7 @@ module.exports = function(grunt) {
         options: {
           separator: '\n',
         },
-        src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'],
+        src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
         dest: 'build/temp/video.js',
       },
     },
@@ -491,6 +500,8 @@ module.exports = function(grunt) {
     grunt.file.write(cssPath, css.replace(/(\\f\w+);/g, "'$1';"));
   });
 
+  grunt.registerTask('skin', ['sass', 'wrapcodepoints']);
+
   // Default task - build and test
   grunt.registerTask('default', ['test']);
 
diff --git a/component.json b/component.json
index 8dab383c79..770bc093e5 100644
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.6.0",
+  "version": "5.9.2",
   "keywords": [
     "videojs",
     "html5",
diff --git a/docs/examples/elephantsdream/captions.ar.vtt b/docs/examples/elephantsdream/captions.ar.vtt
new file mode 100644
index 0000000000..a68a4426f0
--- /dev/null
+++ b/docs/examples/elephantsdream/captions.ar.vtt
@@ -0,0 +1,330 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.625
+...إلى... إلى الشمال يمكن أن نرى
+...يمكن أن نرى الـ
+
+2
+00:00:18.750 --> 00:00:20.958
+...إلى اليمين يمكن أن نرى الـ
+
+3
+00:00:21.000 --> 00:00:23.125
+طاحنات الرؤوس...
+
+4
+00:00:23.208 --> 00:00:25.208
+كل شيئ آمن
+آمن كلية
+
+5
+00:00:26.333 --> 00:00:28.333
+إيمو ؟
+
+6
+00:00:28.875 --> 00:00:30.958
+! حذاري
+
+7
+00:00:47.125 --> 00:00:49.167
+هل أصبت ؟
+
+8
+00:00:52.125 --> 00:00:54.833
+...لا أظن ذلك
+وأنت ؟
+
+9
+00:00:55.625 --> 00:00:57.625
+أنا بخير
+
+10
+00:00:57.667 --> 00:01:01.667
+،قم يا إيمو
+المكان هنا غير آمن
+
+11
+00:01:02.208 --> 00:01:04.083
+لنذهب
+
+12
+00:01:04.167 --> 00:01:06.167
+وماذا بعد ؟
+
+13
+00:01:06.167 --> 00:01:08.583
+...سترى...  سترى
+
+14
+00:01:16.167 --> 00:01:18.375
+إيمو، من هنا
+
+15
+00:01:34.958 --> 00:01:37.000
+! إتبعني
+
+16
+00:02:11.125 --> 00:02:13.625
+! أسرع يا إيمو
+
+17
+00:02:48.375 --> 00:02:50.375
+! لست منتبها
+
+18
+00:02:50.750 --> 00:02:54.500
+...أريد فقط أن أجيب الـ
+الهاتف...
+
+19
+00:02:55.000 --> 00:02:58.500
+،إيمو، أنظر
+أقصد أنصت
+
+20
+00:02:59.750 --> 00:03:03.292
+عليك أن تتعلم الإصغاء
+
+21
+00:03:03.625 --> 00:03:05.917
+هذا ليس ضربا من اللهو
+
+22
+00:03:06.083 --> 00:03:09.958
+...إنك
+أقصد إننا قد نموت بسهولة في هذا المكان
+
+23
+00:03:10.208 --> 00:03:14.125
+...أنصت
+أنصت إلى أصوات الآلة
+
+24
+00:03:18.333 --> 00:03:20.417
+أنصت إلى نَفَسِك
+
+25
+00:04:27.208 --> 00:04:29.250
+ألا تمل أبدا من هذا ؟
+
+26
+00:04:29.583 --> 00:04:31.583
+أمل ؟!؟
+نعم -
+
+27
+00:04:31.750 --> 00:04:34.667
+إيمو؛ الآلة في دقتها... مثل الساعة
+
+28
+00:04:35.500 --> 00:04:37.708
+...حركة ناشزة واحدة قد
+
+29
+00:04:37.833 --> 00:04:39.875
+تطرحك معجونا
+
+30
+00:04:41.042 --> 00:04:43.083
+...أو ليست
+
+31
+00:04:43.125 --> 00:04:46.542
+! عجينة يا إيمو
+أ هذا ما تريد ؟ أن تصبح عجينة ؟
+
+32
+00:04:48.083 --> 00:04:50.083
+أيمو، أ هذا هدفك في الحياة ؟
+
+33
+00:04:50.583 --> 00:04:52.667
+أن تصير عجينة ؟
+
+34
+00:05:41.833 --> 00:05:43.875
+إيمو، أغمض عينيك
+
+35
+00:05:44.917 --> 00:05:47.000
+لماذا ؟
+! الآن -
+
+36
+00:05:53.750 --> 00:05:56.042
+حسن
+
+37
+00:05:59.542 --> 00:06:02.792
+ماذا ترى إلى شمالك يا إيمو ؟
+
+38
+00:06:04.417 --> 00:06:06.500
+لا شيئ
+حقا ؟ -
+
+39
+00:06:06.542 --> 00:06:08.625
+لا، لا شيئ البتة
+
+40
+00:06:08.625 --> 00:06:12.417
+وماذا ترى إلى جهتك اليمنى يا إيمو ؟
+
+41
+00:06:13.667 --> 00:06:17.833
+،نفس الشيئ يا بروغ
+! نفس الشيئ بالضبط؛ لا شيئ
+
+42
+00:06:17.875 --> 00:06:19.917
+عظيم
+
+43
+00:06:40.625 --> 00:06:42.958
+أنصت يا بروغ ! هل تسمع ذلك ؟
+
+44
+00:06:43.625 --> 00:06:45.625
+هل نستطيع الذهاب إلى هناك ؟
+
+45
+00:06:45.708 --> 00:06:47.792
+هناك ؟
+نعم -
+
+46
+00:06:47.833 --> 00:06:49.833
+إنه غير آمن يا إيمو
+
+47
+00:06:49.917 --> 00:06:52.500
+صدقني، إنه غير آمن
+
+48
+00:06:53.292 --> 00:06:55.375
+...لكن لعلي أستطيع
+
+49
+00:06:55.417 --> 00:06:57.417
+...لكن
+! لا -
+
+50
+00:06:57.667 --> 00:06:59.667
+! لا
+
+51
+00:07:00.875 --> 00:07:03.750
+هل من أسئلة أخرى يا إيمو ؟
+
+52
+00:07:04.250 --> 00:07:06.333
+لا
+
+53
+00:07:09.458 --> 00:07:11.542
+...إيمو
+نعم -
+
+54
+00:07:11.875 --> 00:07:13.958
+...لماذا يا إيمو... لماذا
+
+55
+00:07:15.292 --> 00:07:18.792
+لماذا لا تستطيع أن ترى حُسْن هذا المكان
+
+56
+00:07:18.833 --> 00:07:20.833
+...والطريقة التي يعمل بها
+
+57
+00:07:20.875 --> 00:07:24.000
+وكيف... وكيف أنه غاية في الكمال
+
+58
+00:07:24.083 --> 00:07:27.417
+! لا يا بروغ، لا أرى ذلك
+
+59
+00:07:27.542 --> 00:07:30.333
+لا أرى ذلك لأنه لا يوجد شيئ هناك
+
+60
+00:07:31.500 --> 00:07:35.333
+ثم لماذا يجب علي أن أسلم حياتي
+لشيئ لا وجود له ؟
+
+61
+00:07:35.583 --> 00:07:37.625
+هل يمكنك أن تخبرني ؟
+
+62
+00:07:37.708 --> 00:07:39.750
+! أجبني
+
+63
+00:07:43.208 --> 00:07:47.333
+...بروغ
+! أنت معتوه يا هذا
+
+64
+00:07:47.375 --> 00:07:49.417
+! إبعد عني
+
+65
+00:07:52.583 --> 00:07:55.083
+! لا يا إيمو ! إنه فخ
+
+66
+00:07:55.833 --> 00:07:57.875
+...إنه فخ
+
+67
+00:07:57.917 --> 00:08:01.750
+إلى جنبك الأيسر يمكنك أن ترى
+حدائق بابل المعلقة
+
+68
+00:08:02.250 --> 00:08:04.292
+هل تعجبك كفخ ؟
+
+69
+00:08:05.458 --> 00:08:07.542
+لا يا أيمو
+
+70
+00:08:09.417 --> 00:08:12.792
+...إلى جنبك الأيمن يمكنك رؤية
+حزر ماذا ؟
+
+71
+00:08:13.000 --> 00:08:15.042
+! عملاق رودس
+
+72
+00:08:15.125 --> 00:08:16.417
+! لا
+
+73
+00:08:16.458 --> 00:08:20.500
+،عملاق رودس
+وهو هنا خصيصا من أجلك يا بروغ
+
+74
+00:08:20.583 --> 00:08:22.583
+فقط من أجلك
+
+75
+00:08:51.333 --> 00:08:53.375
+إنه هناك
+
+76
+00:08:53.417 --> 00:08:55.500
+أنا أؤكد لك... إيمو
+
+77
+00:08:57.333 --> 00:09:00.000
+...إنه
diff --git a/docs/examples/elephantsdream/captions.en.vtt b/docs/examples/elephantsdream/captions.en.vtt
new file mode 100644
index 0000000000..8b83d28c11
--- /dev/null
+++ b/docs/examples/elephantsdream/captions.en.vtt
@@ -0,0 +1,334 @@
+WEBVTT
+
+1
+00:00:15.000 --> 00:00:17.951
+At the left we can see...
+
+2
+00:00:18.166 --> 00:00:20.083
+At the right we can see the...
+
+3
+00:00:20.119 --> 00:00:21.962
+...the head-snarlers
+
+4
+00:00:21.999 --> 00:00:24.368
+Everything is safe.
+Perfectly safe.
+
+5
+00:00:24.582 --> 00:00:27.035
+Emo?
+
+6
+00:00:28.206 --> 00:00:29.996
+Watch out!
+
+7
+00:00:47.037 --> 00:00:48.494
+Are you hurt?
+
+8
+00:00:51.994 --> 00:00:53.949
+I don't think so.
+You?
+
+9
+00:00:55.160 --> 00:00:56.985
+I'm Ok.
+
+10
+00:00:57.118 --> 00:01:01.111
+Get up.
+Emo. it's not safe here.
+
+11
+00:01:02.034 --> 00:01:03.573
+Let's go.
+
+12
+00:01:03.610 --> 00:01:05.114
+What's next?
+
+13
+00:01:05.200 --> 00:01:09.146
+You'll see!
+
+14
+00:01:16.032 --> 00:01:18.022
+Emo.
+This way.
+
+15
+00:01:34.237 --> 00:01:35.481
+Follow me!
+
+16
+00:02:11.106 --> 00:02:12.480
+Hurry Emo!
+
+17
+00:02:48.059 --> 00:02:49.930
+You're not paying attention!
+
+18
+00:02:50.142 --> 00:02:54.052
+I just want to answer the...
+...phone.
+
+19
+00:02:54.974 --> 00:02:57.972
+Emo. look.
+I mean listen.
+
+20
+00:02:59.140 --> 00:03:02.008
+You have to learn to listen.
+
+21
+00:03:03.140 --> 00:03:04.965
+This is not some game.
+
+22
+00:03:05.056 --> 00:03:09.345
+You. I mean we.
+we could easily die out here.
+
+23
+00:03:10.014 --> 00:03:13.959
+Listen.
+listen to the sounds of the machine.
+
+24
+00:03:18.054 --> 00:03:20.009
+Listen to your breathing.
+
+25
+00:04:27.001 --> 00:04:28.956
+Well. don't you ever get tired of this?
+
+26
+00:04:29.084 --> 00:04:30.909
+Tired?!?
+
+27
+00:04:31.126 --> 00:04:34.491
+Emo. the machine is like clockwork.
+
+28
+00:04:35.083 --> 00:04:37.074
+One move out of place...
+
+29
+00:04:37.166 --> 00:04:39.121
+...and you're ground to a pulp.
+
+30
+00:04:40.958 --> 00:04:42.004
+But isn't it -
+
+31
+00:04:42.041 --> 00:04:46.034
+Pulp. Emo!
+Is that what you want. pulp?
+
+32
+00:04:47.040 --> 00:04:48.995
+Emo. your goal in life...
+
+33
+00:04:50.081 --> 00:04:51.953
+...pulp?
+
+34
+00:05:41.156 --> 00:05:43.028
+Emo. close your eyes.
+
+35
+00:05:44.156 --> 00:05:46.027
+Why?
+- Now!
+
+36
+00:05:51.155 --> 00:05:52.102
+Ok.
+
+37
+00:05:53.113 --> 00:05:54.688
+Good.
+
+38
+00:05:59.070 --> 00:06:02.103
+What do you see at your left side. Emo?
+
+39
+00:06:04.028 --> 00:06:05.899
+Nothing.
+- Really?
+
+40
+00:06:06.027 --> 00:06:07.105
+No. nothing at all.
+
+41
+00:06:07.944 --> 00:06:11.984
+And at your right.
+what do you see at your right side. Emo?
+
+42
+00:06:13.151 --> 00:06:16.102
+The same Proog. exactly the same...
+
+43
+00:06:16.942 --> 00:06:19.098
+...nothing!
+- Great.
+
+44
+00:06:40.105 --> 00:06:42.724
+Listen Proog! Do you hear that!
+
+45
+00:06:43.105 --> 00:06:44.894
+Can we go here?
+
+46
+00:06:44.979 --> 00:06:47.894
+There?
+It isn't safe. Emo.
+
+47
+00:06:49.145 --> 00:06:52.013
+But...
+- Trust me. it's not.
+
+48
+00:06:53.020 --> 00:06:54.145
+Maybe I could...
+
+49
+00:06:54.181 --> 00:06:55.969
+No.
+
+50
+00:06:57.102 --> 00:06:59.934
+NO!
+
+51
+00:07:00.144 --> 00:07:03.058
+Any further questions. Emo?
+
+52
+00:07:03.976 --> 00:07:05.090
+No.
+
+53
+00:07:09.059 --> 00:07:10.089
+Emo?
+
+54
+00:07:11.142 --> 00:07:13.058
+Emo. why...
+
+55
+00:07:13.095 --> 00:07:14.022
+Emo...
+
+56
+00:07:14.058 --> 00:07:18.003
+...why can't you see
+the beauty of this place?
+
+57
+00:07:18.141 --> 00:07:20.048
+The way it works.
+
+58
+00:07:20.140 --> 00:07:23.895
+How perfect it is.
+
+59
+00:07:23.932 --> 00:07:26.964
+No. Proog. I don't see.
+
+60
+00:07:27.056 --> 00:07:29.970
+I don't see because there's nothing there.
+
+61
+00:07:31.055 --> 00:07:34.965
+And why should I trust my
+life to something that isn't there?
+
+62
+00:07:35.055 --> 00:07:36.926
+Well can you tell me that?
+
+63
+00:07:37.054 --> 00:07:38.926
+Answer me!
+
+64
+00:07:42.970 --> 00:07:44.000
+Proog...
+
+65
+00:07:45.053 --> 00:07:46.985
+...you're a sick man!
+
+66
+00:07:47.022 --> 00:07:48.918
+Stay away from me!
+
+67
+00:07:52.052 --> 00:07:54.884
+No! Emo! It's a trap!
+
+68
+00:07:55.135 --> 00:07:56.931
+Hah. it's a trap.
+
+69
+00:07:56.968 --> 00:08:01.043
+At the left side you can see
+the hanging gardens of Babylon!
+
+70
+00:08:01.967 --> 00:08:03.957
+How's that for a trap?
+
+71
+00:08:05.050 --> 00:08:06.922
+No. Emo.
+
+72
+00:08:09.008 --> 00:08:12.088
+At the right side you can see...
+...well guess what...
+
+73
+00:08:12.924 --> 00:08:14.665
+...the colossus of Rhodes!
+
+74
+00:08:15.132 --> 00:08:16.053
+No!
+
+75
+00:08:16.090 --> 00:08:21.919
+The colossus of Rhodes
+and it is here just for you Proog.
+
+76
+00:08:51.001 --> 00:08:52.923
+It is there...
+
+77
+00:08:52.959 --> 00:08:56.040
+I'm telling you.
+Emo...
+
+78
+00:08:57.000 --> 00:08:59.867
+...it is.
\ No newline at end of file
diff --git a/docs/examples/elephantsdream/captions.ja.vtt b/docs/examples/elephantsdream/captions.ja.vtt
new file mode 100644
index 0000000000..4058648e10
--- /dev/null
+++ b/docs/examples/elephantsdream/captions.ja.vtt
@@ -0,0 +1,326 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.042
+左に見えるのは…
+
+2
+00:00:18.750 --> 00:00:20.333
+右に見えるのは…
+
+3
+00:00:20.417 --> 00:00:21.917
+…首刈り機
+
+4
+00:00:22.000 --> 00:00:24.625
+すべて安全
+完璧に安全だ
+
+5
+00:00:26.333 --> 00:00:27.333
+イーモ？
+
+6
+00:00:28.875 --> 00:00:30.250
+危ない！
+
+7
+00:00:47.125 --> 00:00:48.250
+ケガはないか？
+
+8
+00:00:51.917 --> 00:00:53.917
+ええ、多分…
+あなたは？
+
+9
+00:00:55.625 --> 00:00:57.125
+わしは平気だ
+
+10
+00:00:57.583 --> 00:01:01.667
+起きてくれイーモ
+ここは危ない
+
+11
+00:01:02.208 --> 00:01:03.667
+行こう
+
+12
+00:01:03.750 --> 00:01:04.917
+どこに？
+
+13
+00:01:05.875 --> 00:01:07.875
+すぐにわかるさ！
+
+14
+00:01:16.167 --> 00:01:18.375
+イーモ、こっちだ
+
+15
+00:01:34.958 --> 00:01:36.958
+ついて来るんだ！
+
+16
+00:02:11.583 --> 00:02:12.792
+イーモ、早く！
+
+17
+00:02:48.375 --> 00:02:50.083
+むやみにさわるな！
+
+18
+00:02:50.750 --> 00:02:54.500
+僕はただ、電話に
+…出ようと
+
+19
+00:02:55.000 --> 00:02:58.208
+イーモ、見るんだ…
+いや、聞いてくれ
+
+20
+00:02:59.750 --> 00:03:02.292
+君は「聞き方」を知る必要がある
+
+21
+00:03:03.625 --> 00:03:05.125
+これは遊びじゃない
+
+22
+00:03:06.167 --> 00:03:10.417
+我々はここでは
+たやすく死ぬ
+
+23
+00:03:11.208 --> 00:03:14.125
+機械の声を聞くんだ
+
+24
+00:03:18.333 --> 00:03:22.417
+君の息づかいを聞くんだ
+
+25
+00:04:27.208 --> 00:04:29.250
+そんなことして疲れない？
+
+26
+00:04:29.583 --> 00:04:31.083
+疲れる?!
+
+27
+00:04:31.750 --> 00:04:34.667
+この機械は非常に正確で
+
+28
+00:04:35.500 --> 00:04:37.708
+一つ間違えば…
+
+29
+00:04:37.833 --> 00:04:40.792
+…地面に落ちてバラバラだ
+
+30
+00:04:41.042 --> 00:04:42.375
+え、でも―
+
+31
+00:04:42.417 --> 00:04:46.542
+バラバラだぞ、イーモ！
+それでいいのか？
+
+32
+00:04:48.083 --> 00:04:50.000
+バラバラで死ぬんだぞ？
+
+33
+00:04:50.583 --> 00:04:52.250
+バラバラだ！
+
+34
+00:05:41.833 --> 00:05:43.458
+イーモ、目を閉じるんだ
+
+35
+00:05:44.917 --> 00:05:46.583
+なぜ？
+―早く！
+
+36
+00:05:53.750 --> 00:05:56.042
+それでいい
+
+37
+00:05:59.542 --> 00:06:03.792
+左に見えるものは何だ、イーモ？
+
+38
+00:06:04.417 --> 00:06:06.000
+え…何も
+―本当か？
+
+39
+00:06:06.333 --> 00:06:07.917
+全く何も
+
+40
+00:06:08.042 --> 00:06:12.833
+では右は
+何か見えるか、イーモ？
+
+41
+00:06:13.875 --> 00:06:16.917
+同じだよプルーグ、全く同じ…
+
+42
+00:06:17.083 --> 00:06:18.583
+何もない！
+
+43
+00:06:40.625 --> 00:06:43.208
+プルーグ！何か聞こえない？
+
+44
+00:06:43.625 --> 00:06:45.042
+あそこに行かないか？
+
+45
+00:06:45.208 --> 00:06:48.042
+あそこ？
+…安全じゃない
+
+46
+00:06:49.917 --> 00:06:52.500
+でも…
+―本当に危ないぞ
+
+47
+00:06:53.292 --> 00:06:54.792
+大丈夫だよ…
+
+48
+00:06:54.833 --> 00:06:56.333
+だめだ
+
+49
+00:06:57.667 --> 00:07:00.167
+だめだ！
+
+50
+00:07:00.875 --> 00:07:03.750
+まだ続ける気か、イーモ？
+
+51
+00:07:04.250 --> 00:07:05.917
+いいえ…
+
+52
+00:07:09.458 --> 00:07:10.833
+イーモ？
+
+53
+00:07:11.875 --> 00:07:13.542
+イーモ、なぜ…
+
+54
+00:07:13.583 --> 00:07:14.458
+イーモ…
+
+55
+00:07:14.500 --> 00:07:18.500
+…なぜここの美しさが
+見えない？
+
+56
+00:07:18.833 --> 00:07:20.750
+仕組みがこんなに…
+
+57
+00:07:20.875 --> 00:07:24.000
+こんなに完全なのに
+
+58
+00:07:24.083 --> 00:07:27.417
+もういいよ！プルーグ！
+
+59
+00:07:27.542 --> 00:07:30.333
+そこには何もないんだから
+
+60
+00:07:31.500 --> 00:07:35.333
+なぜ命を「ない」物に
+ゆだねなきゃ？
+
+61
+00:07:35.583 --> 00:07:37.125
+教えてくれないか？
+
+62
+00:07:37.500 --> 00:07:39.167
+さあ！
+
+63
+00:07:43.208 --> 00:07:44.583
+プルーグ…
+
+64
+00:07:45.500 --> 00:07:47.333
+あなたは病気なんだ
+
+65
+00:07:47.375 --> 00:07:49.208
+僕から離れてくれ
+
+66
+00:07:52.583 --> 00:07:55.083
+いかん！イーモ！ワナだ！
+
+67
+00:07:55.833 --> 00:07:57.167
+ワナだ？ ふーん
+
+68
+00:07:57.208 --> 00:08:01.750
+左に何が見える？
+バビロンの空中庭園！
+
+69
+00:08:02.250 --> 00:08:04.292
+これがワナとでも？
+
+70
+00:08:05.458 --> 00:08:07.125
+だめだ、イーモ
+
+71
+00:08:09.417 --> 00:08:12.792
+右にあるのは…
+…すごい！…
+
+72
+00:08:13.000 --> 00:08:14.750
+…ロードス島の巨像だ！
+
+73
+00:08:15.833 --> 00:08:16.708
+やめろ！
+
+74
+00:08:16.750 --> 00:08:22.167
+この巨像はあなたの物
+プルーグ、あなたのだよ
+
+75
+00:08:51.333 --> 00:08:53.167
+いってるじゃないか…
+
+76
+00:08:53.208 --> 00:08:55.500
+そこにあるって、イーモ…
+
+77
+00:08:57.333 --> 00:09:00.000
+…あるって
\ No newline at end of file
diff --git a/docs/examples/elephantsdream/captions.ru.vtt b/docs/examples/elephantsdream/captions.ru.vtt
new file mode 100644
index 0000000000..aee7e49f33
--- /dev/null
+++ b/docs/examples/elephantsdream/captions.ru.vtt
@@ -0,0 +1,356 @@
+WEBVTT
+
+1
+00:00:14.958 --> 00:00:17.833
+Слева мы видим...
+
+2
+00:00:18.458 --> 00:00:20.208
+справа мы видим...
+
+3
+00:00:20.333 --> 00:00:21.875
+...голово-клацов.
+
+4
+00:00:22.000 --> 00:00:24.583
+всё в порядке.
+в полном порядке.
+
+5
+00:00:26.333 --> 00:00:27.333
+Имо?
+
+6
+00:00:28.833 --> 00:00:30.250
+Осторожно!
+
+7
+00:00:47.125 --> 00:00:48.250
+Ты не ранен?
+
+8
+00:00:51.875 --> 00:00:53.875
+Вроде нет...
+а ты?
+
+9
+00:00:55.583 --> 00:00:57.125
+Я в порядке.
+
+10
+00:00:57.542 --> 00:01:01.625
+Вставай.
+Имо. здесь не безопасно.
+
+11
+00:01:02.208 --> 00:01:03.625
+Пойдём.
+
+12
+00:01:03.708 --> 00:01:05.708
+Что дальше?
+
+13
+00:01:05.833 --> 00:01:07.833
+Ты увидишь!
+
+14
+00:01:08.000 --> 00:01:08.833
+Ты увидишь...
+
+15
+00:01:16.167 --> 00:01:18.375
+Имо. сюда.
+
+16
+00:01:34.917 --> 00:01:35.750
+За мной!
+
+17
+00:02:11.542 --> 00:02:12.750
+Имо. быстрее!
+
+18
+00:02:48.375 --> 00:02:50.083
+Ты не обращаешь внимания!
+
+19
+00:02:50.708 --> 00:02:54.500
+Я только хотел ответить на ...
+...звонок.
+
+20
+00:02:55.000 --> 00:02:58.208
+Имо. смотри.
+то есть слушай...
+
+21
+00:02:59.708 --> 00:03:02.292
+Ты должен учиться слушать.
+
+22
+00:03:03.250 --> 00:03:05.333
+Это не какая-нибудь игра.
+
+23
+00:03:06.000 --> 00:03:08.833
+Ты. вернее мы. легко можем погибнуть здесь.
+
+24
+00:03:10.000 --> 00:03:11.167
+Слушай...
+
+25
+00:03:11.667 --> 00:03:14.125
+слушай звуки машины.
+
+26
+00:03:18.333 --> 00:03:20.417
+Слушай своё дыхание.
+
+27
+00:04:27.208 --> 00:04:29.250
+И не надоест тебе это?
+
+28
+00:04:29.542 --> 00:04:31.083
+Надоест?!?
+
+29
+00:04:31.708 --> 00:04:34.625
+Имо! Машина -
+она как часовой механизм.
+
+30
+00:04:35.500 --> 00:04:37.667
+Одно движение не туда...
+
+31
+00:04:37.792 --> 00:04:39.750
+...и тебя размелют в месиво!
+
+32
+00:04:41.042 --> 00:04:42.375
+А разве это не -
+
+33
+00:04:42.417 --> 00:04:46.500
+Месиво. Имо!
+ты этого хочешь? месиво?
+
+34
+00:04:48.083 --> 00:04:50.000
+Имо. твоя цель в жизни?
+
+35
+00:04:50.542 --> 00:04:52.250
+Месиво!
+
+36
+00:05:41.792 --> 00:05:43.458
+Имо. закрой глаза.
+
+37
+00:05:44.875 --> 00:05:46.542
+Зачем?
+- Ну же!
+
+38
+00:05:51.500 --> 00:05:52.333
+Ладно.
+
+39
+00:05:53.708 --> 00:05:56.042
+Хорошо.
+
+40
+00:05:59.500 --> 00:06:02.750
+Что ты видишь слева от себя. Имо?
+
+41
+00:06:04.417 --> 00:06:06.000
+Ничего.
+- Точно?
+
+42
+00:06:06.333 --> 00:06:07.875
+да. совсем ничего.
+
+43
+00:06:08.042 --> 00:06:12.708
+А справа от себя.
+что ты видишь справа от себя. Имо?
+
+44
+00:06:13.833 --> 00:06:16.875
+Да то же Пруг. в точности то же...
+
+45
+00:06:17.042 --> 00:06:18.500
+Ничего!
+
+46
+00:06:18.667 --> 00:06:19.500
+Прекрасно...
+
+47
+00:06:40.583 --> 00:06:42.917
+Прислушайся. Пруг! Ты слышишь это?
+
+48
+00:06:43.583 --> 00:06:45.042
+Может. мы пойдём туда?
+
+49
+00:06:45.208 --> 00:06:48.042
+Туда?
+Это не безопасно. Имо.
+
+50
+00:06:49.875 --> 00:06:52.500
+Но...
+- Поверь мне. это так.
+
+51
+00:06:53.292 --> 00:06:54.750
+Может я бы ...
+
+52
+00:06:54.792 --> 00:06:56.333
+Нет.
+
+53
+00:06:57.625 --> 00:06:59.583
+- Но...
+- НЕТ!
+
+54
+00:06:59.708 --> 00:07:00.833
+Нет!
+
+55
+00:07:00.833 --> 00:07:03.708
+Ещё вопросы. Имо?
+
+56
+00:07:04.250 --> 00:07:05.875
+Нет.
+
+57
+00:07:09.458 --> 00:07:10.792
+Имо?
+
+58
+00:07:11.833 --> 00:07:13.500
+Имо. почему...
+
+59
+00:07:13.542 --> 00:07:14.458
+Имо...
+
+60
+00:07:14.500 --> 00:07:18.500
+...почему? почему ты не видишь
+красоты этого места?
+
+61
+00:07:18.792 --> 00:07:20.708
+То как оно работает.
+
+62
+00:07:20.833 --> 00:07:24.000
+Как совершенно оно.
+
+63
+00:07:24.083 --> 00:07:27.417
+Нет. Пруг. я не вижу.
+
+64
+00:07:27.500 --> 00:07:30.333
+Я не вижу. потому что здесь ничего нет.
+
+65
+00:07:31.375 --> 00:07:35.333
+И почему я должен доверять свою жизнь
+чему-то. чего здесь нет?
+
+66
+00:07:35.542 --> 00:07:37.125
+это ты мне можешь сказать?
+
+67
+00:07:37.500 --> 00:07:39.167
+Ответь мне!
+
+68
+00:07:43.208 --> 00:07:44.542
+Пруг...
+
+69
+00:07:45.500 --> 00:07:47.333
+Ты просто больной!
+
+70
+00:07:47.375 --> 00:07:48.500
+Отстань от меня.
+
+71
+00:07:48.625 --> 00:07:49.917
+Имо...
+
+72
+00:07:52.542 --> 00:07:55.083
+Нет! Имо! Это ловушка!
+
+73
+00:07:55.792 --> 00:07:57.167
+Это ловушка!
+
+74
+00:07:57.208 --> 00:08:01.708
+Слева от себя вы можете увидеть
+Висящие сады Семирамиды!
+
+75
+00:08:02.250 --> 00:08:04.292
+Сойдёт за ловушку?
+
+76
+00:08:05.458 --> 00:08:07.125
+Нет. Имо.
+
+77
+00:08:09.417 --> 00:08:12.750
+Справа от себя вы можете увидеть...
+...угадай кого...
+
+78
+00:08:13.000 --> 00:08:14.708
+...Колосса Родосского!
+
+79
+00:08:15.500 --> 00:08:16.625
+Нет!
+
+80
+00:08:16.667 --> 00:08:21.125
+Колосс Родосский!
+И он здесь специально для тебя. Пруг.
+
+81
+00:08:21.167 --> 00:08:22.208
+Специально для тебя...
+
+82
+00:08:51.333 --> 00:08:53.167
+Она здесь есть!
+
+83
+00:08:53.208 --> 00:08:55.500
+Говорю тебе.
+Имо...
+
+84
+00:08:57.333 --> 00:09:00.000
+...она есть... есть...
\ No newline at end of file
diff --git a/docs/examples/elephantsdream/captions.sv.vtt b/docs/examples/elephantsdream/captions.sv.vtt
new file mode 100644
index 0000000000..6666eedfbc
--- /dev/null
+++ b/docs/examples/elephantsdream/captions.sv.vtt
@@ -0,0 +1,349 @@
+WEBVTT
+
+1
+00:00:15.042 --> 00:00:18.250
+Till vänster kan vi se...
+Ser vi...
+
+2
+00:00:18.708 --> 00:00:20.333
+Till höger ser vi...
+
+3
+00:00:20.417 --> 00:00:21.958
+...huvudkaparna.
+
+4
+00:00:22.000 --> 00:00:24.792
+Allt är säkert.
+alldeles ofarligt.
+
+5
+00:00:24.917 --> 00:00:26.833
+Emo?
+
+6
+00:00:28.750 --> 00:00:30.167
+Se upp!
+
+7
+00:00:46.708 --> 00:00:48.750
+Är du skadad?
+
+8
+00:00:51.875 --> 00:00:54.458
+Jag tror inte det...
+Är du?
+
+9
+00:00:55.292 --> 00:00:57.333
+Jag är ok.
+
+10
+00:00:57.542 --> 00:01:01.625
+Res dig upp Emo.
+Det är inte säkert här.
+
+11
+00:01:02.208 --> 00:01:03.625
+Kom så går vi.
+
+12
+00:01:03.708 --> 00:01:05.708
+Vad nu då?
+
+13
+00:01:05.833 --> 00:01:07.833
+Du får se...
+
+14
+00:01:08.042 --> 00:01:10.417
+Du får se.
+
+15
+00:01:15.958 --> 00:01:18.375
+Emo. den här vägen.
+
+16
+00:01:34.417 --> 00:01:36.750
+Följ efter mig!
+
+17
+00:02:11.250 --> 00:02:13.250
+Skynda dig. Emo!
+
+18
+00:02:48.375 --> 00:02:50.583
+Du är inte uppmärksam!
+
+19
+00:02:50.708 --> 00:02:54.500
+Jag vill bara svara...
+... i telefonen.
+
+20
+00:02:54.500 --> 00:02:58.208
+Emo. se här...
+Lyssna menar jag.
+
+21
+00:02:59.708 --> 00:03:02.292
+Du måste lära dig att lyssna.
+
+22
+00:03:03.292 --> 00:03:05.208
+Det här är ingen lek.
+
+23
+00:03:05.250 --> 00:03:08.917
+Du... Jag menar vi.
+vi skulle kunna dö här ute.
+
+24
+00:03:09.917 --> 00:03:11.417
+Lyssna...
+
+25
+00:03:11.708 --> 00:03:14.833
+Lyssna på ljuden från maskinen.
+
+26
+00:03:18.125 --> 00:03:21.417
+Lyssna på dina andetag.
+
+27
+00:04:26.625 --> 00:04:29.250
+Tröttnar du aldrig på det här?
+
+28
+00:04:29.542 --> 00:04:31.083
+Tröttnar!?
+
+29
+00:04:31.208 --> 00:04:33.458
+Emo. maskinen är som...
+
+30
+00:04:33.458 --> 00:04:35.333
+Som ett urverk.
+
+31
+00:04:35.417 --> 00:04:37.167
+Ett felsteg...
+
+32
+00:04:37.208 --> 00:04:39.750
+...och du blir krossad.
+
+33
+00:04:41.042 --> 00:04:42.292
+Men är det inte -
+
+34
+00:04:42.292 --> 00:04:47.000
+Krossad. Emo!
+Är det vad du vill bli? Krossad till mos?
+
+35
+00:04:47.500 --> 00:04:50.542
+Emo. är det ditt mål i livet?
+
+36
+00:04:50.667 --> 00:04:53.250
+Att bli mos!?
+
+37
+00:05:41.375 --> 00:05:43.458
+Emo. blunda.
+
+38
+00:05:44.375 --> 00:05:46.542
+Varför då?
+- Blunda!
+
+39
+00:05:51.292 --> 00:05:55.042
+Ok.
+- Bra.
+
+40
+00:05:59.500 --> 00:06:02.750
+Vad ser du till vänster om dig Emo?
+
+41
+00:06:04.125 --> 00:06:06.292
+Ingenting.
+- Säker?
+
+42
+00:06:06.333 --> 00:06:07.958
+Ingenting alls.
+
+43
+00:06:08.042 --> 00:06:12.625
+Jaså. och till höger om dig...
+Vad ser du där. Emo?
+
+44
+00:06:13.750 --> 00:06:15.583
+Samma där Proog...
+
+45
+00:06:15.583 --> 00:06:18.083
+Exakt samma där. ingenting!
+
+46
+00:06:18.083 --> 00:06:19.667
+Perfekt.
+
+47
+00:06:40.500 --> 00:06:42.917
+Lyssna Proog! Hör du?
+
+48
+00:06:43.500 --> 00:06:45.125
+Kan vi gå dit?
+
+49
+00:06:45.208 --> 00:06:48.125
+Gå dit?
+Det är inte tryggt.
+
+50
+00:06:49.583 --> 00:06:52.583
+Men. men...
+- Tro mig. det inte säkert.
+
+51
+00:06:53.000 --> 00:06:54.292
+Men kanske om jag -
+
+52
+00:06:54.292 --> 00:06:56.333
+Nej.
+
+53
+00:06:57.208 --> 00:07:00.167
+Men -
+- Nej. NEJ!
+
+54
+00:07:00.917 --> 00:07:03.792
+Några fler frågor Emo?
+
+55
+00:07:04.250 --> 00:07:05.875
+Nej.
+
+56
+00:07:09.542 --> 00:07:11.375
+Emo?
+- Ja?
+
+57
+00:07:11.542 --> 00:07:15.667
+Emo. varför...
+
+58
+00:07:15.792 --> 00:07:18.583
+Varför kan du inte se skönheten i det här?
+
+59
+00:07:18.792 --> 00:07:21.708
+Hur det fungerar.
+
+60
+00:07:21.833 --> 00:07:24.000
+Hur perfekt det är.
+
+61
+00:07:24.083 --> 00:07:27.333
+Nej Proog. jag kan inte se det.
+
+62
+00:07:27.333 --> 00:07:30.333
+Jag ser det inte. för det finns inget där.
+
+63
+00:07:31.292 --> 00:07:35.333
+Och varför skulle jag lägga mitt liv
+i händerna på något som inte finns?
+
+64
+00:07:35.333 --> 00:07:37.083
+Kan du berätta det för mig?
+- Emo...
+
+65
+00:07:37.083 --> 00:07:39.167
+Svara mig!
+
+66
+00:07:43.500 --> 00:07:45.208
+Proog...
+
+67
+00:07:45.208 --> 00:07:47.083
+Du är inte frisk!
+
+68
+00:07:47.167 --> 00:07:49.292
+Håll dig borta från mig!
+
+69
+00:07:52.292 --> 00:07:55.083
+Nej! Emo!
+Det är en fälla!
+
+70
+00:07:55.375 --> 00:07:57.208
+Heh. det är en fälla.
+
+71
+00:07:57.208 --> 00:08:01.708
+På vänster sida ser vi...
+Babylons hängande trädgårdar!
+
+72
+00:08:01.958 --> 00:08:04.000
+Vad sägs om den fällan?
+
+73
+00:08:05.458 --> 00:08:07.333
+Nej. Emo.
+
+74
+00:08:08.917 --> 00:08:12.667
+Till höger ser vi...
+Gissa!
+
+75
+00:08:12.750 --> 00:08:15.125
+Rhodos koloss!
+
+76
+00:08:15.375 --> 00:08:16.500
+Nej!
+
+77
+00:08:16.500 --> 00:08:20.250
+Kolossen på Rhodos!
+Och den är här för din skull. Proog...
+
+78
+00:08:20.250 --> 00:08:23.250
+Bara för din skull.
+
+79
+00:08:50.917 --> 00:08:53.250
+Den är där...
+
+80
+00:08:53.625 --> 00:08:56.417
+Tro mig.
+Emo...
+
+81
+00:08:57.000 --> 00:09:00.000
+Det är den.
+Det är den...
\ No newline at end of file
diff --git a/docs/examples/elephantsdream/chapters.en.vtt b/docs/examples/elephantsdream/chapters.en.vtt
new file mode 100644
index 0000000000..9740a4130e
--- /dev/null
+++ b/docs/examples/elephantsdream/chapters.en.vtt
@@ -0,0 +1,44 @@
+WEBVTT
+
+NOTE Created by Owen Edwards 2015. http://creativecommons.org/licenses/by/2.5/
+NOTE Based on 'finalbreakdown.rtf', part of the prepoduction notes, which are:
+NOTE (c) Copyright 2006, Blender Foundation / 
+NOTE                     Netherlands Media Art Institute / 
+NOTE                     www.elephantsdream.org
+
+1
+00:00:00.000 --> 00:00:27.500
+Prologue
+
+2
+00:00:27.500 --> 00:01:10.000
+Switchboard trap
+
+3
+00:01:10.000 --> 00:03:25.000
+Telephone/Lecture
+
+4
+00:03:25.000 --> 00:04:52.000
+Typewriter
+
+5
+00:04:52.000 --> 00:06:19.500
+Proog shows Emo stuff
+
+6
+00:06:19.500 --> 00:07:09.000
+Which way
+
+7
+00:07:09.000 --> 00:07:45.000
+Emo flips out
+
+8
+00:07:45.000 --> 00:09:25.000
+Emo creates
+
+9
+00:09:25.000 --> 00:10:53.000
+Closing credits
+
diff --git a/docs/examples/elephantsdream/descriptions.en.vtt b/docs/examples/elephantsdream/descriptions.en.vtt
new file mode 100644
index 0000000000..8835b7009a
--- /dev/null
+++ b/docs/examples/elephantsdream/descriptions.en.vtt
@@ -0,0 +1,280 @@
+WEBVTT
+License: CC BY 4.0 http://creativecommons.org/licenses/by/4.0/
+Author: Silvia Pfeiffer
+
+1
+00:00:00.000 --> 00:00:05.000
+The orange open movie project presents
+
+2
+00:00:05.010 --> 00:00:12.000
+Introductory titles are showing on the background of a water pool with fishes swimming and mechanical objects lying on a stone floor.
+
+3
+00:00:12.010 --> 00:00:14.800
+elephants dream
+
+4
+00:00:26.100 --> 00:00:28.206
+Two people stand on a small bridge.
+
+5
+00:00:30.010 --> 00:00:40.000
+The old man, Proog, shoves the younger and less experienced Emo on the ground to save him from being mowed down by a barrage of jack plugs that whir back and forth between the two massive switch-board-like walls.
+
+6
+00:00:40.000 --> 00:00:47.000
+The plugs are oblivious of the two, endlessly channeling streams of bizarre sounds and data.
+
+7
+00:00:48.494 --> 00:00:51.994
+Emo sits on the bridge and checks his limbs.
+
+8
+00:01:09.150 --> 00:01:16.030
+After the squealing plugs move on, Proog makes sure that Emo is unharmed and urges him onwards through a crack in one of the plug-walls.
+
+9
+00:01:18.050 --> 00:01:24.000
+They walk through the narrow hall into a massive room that fades away into blackness on all sides.
+
+10
+00:01:24.050 --> 00:01:34.200
+Only one path is visible, suspended in mid-air that runs between thousands of dangling electric cables on which sit crowds of robin-like robotic birds.
+
+11
+00:01:36.000 --> 00:01:40.000
+As Proog and Emo enter the room, the birds begin to wake up and notice them.
+
+12
+00:01:42.000 --> 00:01:50.000
+Realizing the danger, Proog grabs Emo by the arm.
+
+13
+00:01:50.050 --> 00:02:00.000
+They run along the increasingly bizarre path as the birds begin to swarm.
+
+14
+00:02:00.050 --> 00:02:11.000
+All sound is blocked out by the birds which are making the same noises as the jack-plugs, garbled screaming and obscure sentences and static.
+
+15
+00:02:12.600 --> 00:02:17.000
+The path dead-ends, stopping in the middle of no-where above the infinite drop.
+
+16
+00:02:17.600 --> 00:02:22.000
+Proog turns around as the birds reach them and begin to dive-bomb at them.
+
+17
+00:02:22.600 --> 00:02:28.000
+At the last moment, Proog takes out an old candlestick phone and the birds dive into the speaker piece.
+
+18
+00:02:28.600 --> 00:02:31.000
+The screen cuts to black.
+
+19
+00:02:31.600 --> 00:02:38.000
+In the next scene, Proog stands at one end of a room, suspiciously watching what is probably the same candlestick phone, which is ringing.
+
+20
+00:02:38.500 --> 00:02:41.000
+Emo watches from the other side of the room.
+
+21
+00:02:41.500 --> 00:02:43.000
+The phone continues to ring.
+
+22
+00:02:43.500 --> 00:02:48.000
+After a while Emo approaches it to answer it, but Proog slaps his hand away.
+
+23
+00:02:57.972 --> 00:02:59.100
+Proog takes the ear-piece off the hook.
+
+24
+00:03:13.500 --> 00:03:18.054
+The phone speaker revealed a mass of clawed, fleshy polyps which scream and gibber obscenely.
+
+25
+00:03:25.000 --> 00:03:33.000
+There is a solemn silence as Emo looks around the room and the technical objects therein.
+
+26
+00:03:38.000 --> 00:03:44.000
+Emo laughs disbelievingly and Proog walks away.
+
+27
+00:03:46.000 --> 00:03:54.000
+In the next scene, the two enter another massive black room.
+
+28
+00:03:54.500 --> 00:04:04.000
+There is no path, the entry platform is the only structure that seems to be there except for another exit, lit distantly at the far side.
+
+29
+00:04:04.500 --> 00:04:14.000
+Proog takes a step forward into the void, and his feet are suddenly caught by giant typewriter arms that rocket up out of the blackness to catch his feet as he dances across mid-air.
+
+30
+00:04:14.500 --> 00:04:22.000
+Emo follows Proog with somewhat less enthusiasm as the older man leads the way.
+
+31
+00:04:52.000 --> 00:04:58.000
+They reach the end of the room and go through a hall into a small compartment.
+
+32
+00:05:02.000 --> 00:05:06.000
+Proog presses a button, and the door shuts.
+
+33
+00:05:06.500 --> 00:05:09.000
+It is an elevator.
+
+34
+00:05:09.500 --> 00:05:24.000
+The elevator lurches suddenly as it is grabbed by a giant mechanical arm and thrown upwards, rushing up through an ever-widening tunnel.
+
+35
+00:05:26.500 --> 00:05:32.000
+When it begins to slow down, another arm grabs the capsule and throws it even further up.
+
+36
+00:05:32.500 --> 00:05:40.000
+As it moves up, the walls unlock and fall away, leaving only the floor with the two on it, rushing higher and higher.
+
+37
+00:05:54.500 --> 00:05:59.000
+They exit the tunnel into a black sky and the platform reaches the peak of its arc.
+
+38
+00:06:19.500 --> 00:06:26.000
+The elevator begins to drop down another shaft, coming to rest as it slams into the floor of another room and bringing the two to a level stop.
+
+39
+00:06:26.500 --> 00:06:28.000
+A camera flashes.
+
+40
+00:06:28.010 --> 00:06:34.000
+They are in a large, dingy room filled with strange, generator-like devices and dotted with boxy holographic projectors.
+
+41
+00:06:34.500 --> 00:06:38.000
+One of them is projecting a portion of wall with a door in it right beside them.
+
+42
+00:06:38.500 --> 00:06:40.000
+The door seems harmless enough.
+
+43
+00:06:42.800 --> 00:06:45.100
+From behind the door comes light music.
+
+44
+00:06:56.000 --> 00:07:00.100
+Proog presses a button on his cane, which changes the holograph to another wall.
+
+45
+00:07:05.100 --> 00:07:11.000
+Proog finishes the wall, and boxes them into a Safe Room, out of the view of anything outside.
+
+46
+00:07:39.000 --> 00:07:42.500
+Proog slaps him, trying to bring him to his senses.
+
+47
+00:07:45.000 --> 00:07:52.000
+Emo storms away down the length of the room towards a wall he apparently cannot see and the wall begins to move, extending the length of the room.
+
+48
+00:08:00.000 --> 00:08:07.000
+The walls begin to discolour and mechanical roots start tearing through the walls to his left.
+
+49
+00:08:07.010 --> 00:08:09.000
+The roots move forwards toward Proog.
+
+50
+00:08:22.000 --> 00:08:31.000
+The rest of the safety wall crumples away as a pair of massive hands heave out of the ground and begin to attack.
+
+51
+00:08:31.010 --> 00:08:37.000
+Proog is knocked down by the shockwave, while Emo turns and begins to walk away, waving his finger around his temple in the 'crazy' sign.
+
+52
+00:08:37.010 --> 00:08:44.000
+In a last effort, Proog extricates himself from the tentacle roots, and cracks Emo over the back of the head with his cane.
+
+53
+00:08:44.500 --> 00:08:51.000
+As Emo collapses, everything falls away, and Proog and Emo are left in one tiny patch of light in the middle of blackness.
+
+54
+00:09:00.000 --> 00:09:20.000
+The scene fades to black while panning over a pile of tentacle roots lying on the ground.
+
+55
+00:09:26.000 --> 00:09:28.000
+Credits begin:
+
+56
+00:09:28.500 --> 00:09:35.000
+Orange Open Movie Team
+Director: Bassum Kurdali
+Art Director: Andreas Goralczyk
+
+57
+00:09:35.500 --> 00:09:39.000
+Music and Sound Design: Jan Morgenstern
+
+58
+00:09:39.500 --> 00:09:44.000
+Emo: Cas Jansen
+Proog: Tygo Gernandt
+
+59
+00:09:44.500 --> 00:09:50.000
+Screenplay: Pepijn Zwanenberg
+Original Concept & Scenario: Andreas Goralczyk, Bassam Kurdali, Ton Roosendaal
+
+60
+00:09:50.500 --> 00:10:24.000
+More people for
+Additional Artwork and Animation
+Texture Photography
+Software Development
+3D Modelling, Animation, Rendering, Compiling Software
+Special Thanks to Open Source Projects
+Rendering Services Provided
+Hardware  Sponsored
+Casting
+Sound FX, Foley, Dialogue Editing, Audio Mix and Post
+Voice Recording
+HDCam conversion
+Netherlands Media Art Institute Staff
+Blender Foundation Staff
+
+61
+00:10:24.500 --> 00:10:30.000
+Many Thanks to our Donation and DVD sponsors
+
+62
+00:10:30.500 --> 00:10:47.000
+Elephants Dream has been realised with financial support from
+The Netherlands Film Fund
+Mondriaan Foundation
+VSBfonds
+Uni-Verse / EU Sixth Framework Programme
+
+63
+00:10:47.500 --> 00:10:53.000
+Produced By
+Ton Roosendaal
+Copyright 2006
+Netherlands Media Art Institute / Montevideo
+Blender Foundation
diff --git a/docs/examples/elephantsdream/index.html b/docs/examples/elephantsdream/index.html
new file mode 100644
index 0000000000..09dd90b61d
--- /dev/null
+++ b/docs/examples/elephantsdream/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>Video.js Text Descriptions, Chapters &amp; Captions Example</title>
+
+  <link href="../../video-js.css" rel="stylesheet" type="text/css">
+
+  <script src="../../video.js"></script>
+
+  <!-- Set the location of the flash SWF -->
+  <script>
+    videojs.setGlobalOptions({
+      flash: {
+        swf: '../../video-js.swf'
+      }
+    });
+  </script>
+
+</head>
+<body>
+  <p style="background-color:#eee; border: 1px solid #777; padding: 10px; font-size: .8em; line-height: 1.5em; font-family: Verdana, sans-serif;">This page demonstrates a text descriptions track (intended primarily for blind and visually impaired consumers of visual media)</p>
+
+  <!-- NOTE: we have to disable native Text Track support for the HTML5 tech,
+             since even HTML5 video players with native Text Track support
+             don't currently support 'description' text tracks in any
+             useful way! -->
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="360"
+      data-setup='{ "html5" : { "nativeTextTracks" : false } }'>
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.mp4" type="video/mp4">
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.ogv" type="video/ogv">
+
+    <track kind="captions" src="captions.en.vtt" srclang="en" label="English" default></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="captions" src="captions.sv.vtt" srclang="sv" label="Swedish"></track>
+    <track kind="captions" src="captions.ru.vtt" srclang="ru" label="Russian"></track>
+    <track kind="captions" src="captions.ja.vtt" srclang="ja" label="Japanese"></track>
+    <track kind="captions" src="captions.ar.vtt" srclang="ar" label="Arabic"></track>
+
+    <track kind="descriptions" src="descriptions.en.vtt" srclang="en" label="English"></track>
+
+    <track kind="chapters" src="chapters.en.vtt" srclang="en" label="English"></track>
+
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
+  </video>
+</body>
+</html>
diff --git a/docs/guides/components.md b/docs/guides/components.md
index f950a7592b..9bd6869300 100644
--- a/docs/guides/components.md
+++ b/docs/guides/components.md
@@ -41,19 +41,46 @@ Player
     BigPlayButton
     ControlBar
         PlayToggle
-        FullscreenToggle
-        CurrentTimeDisplay
-        TimeDivider
-        DurationDisplay
-        RemainingTimeDisplay
+        VolumeMenuButton
+        CurrentTimeDisplay (Hidden by default)
+        TimeDivider (Hidden by default)
+        DurationDisplay (Hidden by default)
         ProgressControl
             SeekBar
               LoadProgressBar
+              MouseTimeDisplay
               PlayProgressBar
-              SeekHandle
-        VolumeControl
-            VolumeBar
-                VolumeLevel
-                VolumeHandle
-        MuteToggle
+        LiveDisplay (Hidden by default)
+        RemainingTimeDisplay
+        CustomControlsSpacer (No UI)
+        ChaptersButton (Hidden by default)
+        SubtitlesButton (Hidden by default)
+        CaptionsButton (Hidden by default)
+        FullscreenToggle
+    ErrorDisplay
+    TextTrackSettings
+```
+
+## Progress Control
+The progress control is made up of the SeekBar. The seekbar contains the load progress bar
+and the play progress bar. In addition, it contains the Mouse Time Display which
+is used to display the time tooltip that follows the mouse cursor.
+The play progress bar also has a time tooltip that show the current time.
+
+By default, the progress control is sandwiched between the volume menu button and
+the remaining time display inside the control bar, but in some cases, a skin would
+want to move the progress control above the control bar and have it span the full
+width of the player, in those cases, it is less than ideal to have the tooltips
+get cut off or leave the bounds of the player. This can be prevented by setting the
+`keepTooltipsInside` option on the progress control. This also makes the tooltips use 
+a real element instead of pseudo elements so targetting them with css will be different.
+
+```js
+let player = videojs('myplayer', {
+  controlBar: {
+    progressControl: {
+      keepTooltipsInside: true
+    }
+  }
+});
 ```
diff --git a/docs/guides/languages.md b/docs/guides/languages.md
index 893c6beb3d..1887f398bd 100644
--- a/docs/guides/languages.md
+++ b/docs/guides/languages.md
@@ -5,7 +5,11 @@ Multiple language support allows for users of non-English locales to natively in
 
 Creating the Language File
 --------------------------
-Video.js uses key/value object dictionaries in JSON form. A sample dictionary for Spanish `['es']` would look as follows;
+Video.js uses key/value object dictionaries in JSON form.
+
+An English lang file is at [/lang/en.json](https://github.com/videojs/video.js/tree/master/lang/en.json) which should be used as a template for new files. This will be kept up to date with strings in the core player that need localizations.
+
+A sample dictionary for Spanish `['es']` would look as follows:
 
 ```JSON
 {
@@ -21,7 +25,7 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
   "Playback Rate": "Velocidad de reproducción",
   "Subtitles": "Subtítulos",
   "subtitles off": "Subtítulos desactivados",
@@ -38,7 +42,7 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
 
 Notes:
 
-- The file name should always be in the format `XX.json`, where `XX` is the two letter value of the language reported to the browser (for options see the bottom of this document).
+- The file name should always be in the format `XX.json`, where `XX` is the language code. This should be a two letter code (for options see the bottom of this document) except for cases where a more specific code with sub-code is appropriate, e.g. `zh-CN.lang`.
 - For automatic inclusion at build time, add your language file to the `/lang` directory (see 'Adding Languages to Video.js below').
 
 Adding Languages to Video.js
@@ -69,7 +73,7 @@ NOTE: These need to be added after the core Video.js script.
     "Fullscreen": "Pantalla completa",
     "Non-Fullscreen": "Pantalla no completa",
     "Mute": "Silenciar",
-    "Unmuted": "No silenciado",
+    "Unmute": "No silenciado",
     "Playback Rate": "Velocidad de reproducción",
     "Subtitles": "Subtítulos",
     "subtitles off": "Subtítulos desactivados",
diff --git a/docs/guides/setup.md b/docs/guides/setup.md
index 6733ad5541..4fbdf71093 100644
--- a/docs/guides/setup.md
+++ b/docs/guides/setup.md
@@ -41,10 +41,11 @@ $ bower install --save video.js
 
 ### Self Hosted. ###
 To entirely self-host, you'll need to pull in the font files and let Video.js know where the swf is located. If you simply copy the dist folder or zip file contents into your project everything
-should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file.
+should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file. Additionally include the [videojs-vtt.js](https://www.npmjs.com/package/videojs-vtt.js) source, which adds the `WebVTT` object to the global scope.
 
 ```html
 <link href="//example.com/path/to/video-js.min.css" rel="stylesheet">
+<script src="//example.com/path/to/videojs-vtt.js"></script>
 <script src="//example.com/path/to/video.min.js"></script>
 <script>
   videojs.options.flash.swf = "http://example.com/path/to/video-js.swf"
diff --git a/docs/guides/skins.md b/docs/guides/skins.md
index 4f3060b3ed..2ecdcb47a2 100644
--- a/docs/guides/skins.md
+++ b/docs/guides/skins.md
@@ -1,20 +1,41 @@
 Skins
 =====
 
-The base Video.js skin is made using HTML and CSS (although we use the [Sass preprocessor](http://sass-lang.com)), and by default these styles are added to the dom for you! That means you can build a custom skin by simply taking advantage of the cascading aspect of CSS and overriding
+## Base Skin
+The base Video.js skin is made using HTML and CSS (although we use the [Sass preprocessor](http://sass-lang.com)),
+and by default these styles are added to the DOM for you!
+That means you can build a custom skin by simply taking advantage of the cascading aspect of CSS and overriding
 the styles you'd like to change.
 
-If you don't want Video.js to inject the base styles for you, you can disable it by setting `window.VIDEOJS_NO_BASE_THEME = false` before Video.js is loaded. Keep in mind that without these base styles
-enabled, you'll need to manually include them.
+If you don't want Video.js to inject the base styles for you, you can disable it by setting `window.VIDEOJS_NO_BASE_THEME = true` before Video.js is loaded.
+Keep in mind that without these base styles enabled, you'll need to manually include them.
+
+Video.js does not currently include the base skin automatically yet, so, this option isn't necessary.
+
+## Default style elements
+Video.js uses a couple of style elements dynamically, specifically, there's a default styles element as well as a player dimensions style element.
+They are used to provide extra default flexiblity with styling the player. However, in some cases, like if a user has the HEAD tag managed by React, users do not want this.
+When `window.VIDEOJS_NO_DYNAMIC_STYLE` is set to `true`, video.js will *not* include these element in the page.
+This means that default dimensions and configured player dimensions will *not* be applied.
+For example, the following player will end up having a width and height of 0 when initialized if `window.VIDEOJS_NO_DYNAMIC_STYLE === true`:
+```html
+<video width="600" height="300"></video>
+```
+
+### `Player#width` and `Player#height`
+When `VIDEOJS_NO_DYNAMIC_STYLE` is set, `Player#width` and `Player#height` will apply any width and height
+that is set directly to the video element (or whatever element the current tech uses).
+
 
 ## Icons
 
-You can view all of the icons available in the base theme by renaming and viewing [`icons.html.example`](https://github.com/videojs/video.js/blob/master/sandbox/icons.html.example) in the sandbox directory.
+You can view all of the icons available in the base theme by renaming and viewing
+[`icons.html.example`](https://github.com/videojs/video.js/blob/master/sandbox/icons.html.example) in the sandbox directory.
 
 ## Customization
 
-When you create a new skin, the easiest way to get started is to simply override the base Video.js theme. You should include a new class matching the
-name of your theme, then just start overriding!
+When you create a new skin, the easiest way to get started is to simply override the base Video.js theme.
+You should include a new class matching the name of your theme, then just start overriding!
 
 ```css
 .vjs-skin-hotdog-stand { color: #FF0000; }
@@ -22,8 +43,12 @@ name of your theme, then just start overriding!
 .vjs-skin-hotdog-stand .vjs-play-progress { background: #FF0000; }
 ```
 
-This would take care of the major areas of the skin (play progress, the control bar background, and icon colors), but you can skin any other aspect.
-Our suggestion is to use a browser such as Firefox and Chrome, and use the developer tools to inspect the different elements and see what you'd like to change and what classes
+This would take care of the major areas of the skin (play progress, the control bar background, and icon colors),
+but you can skin any other aspect.
+Our suggestion is to use a browser such as Firefox and Chrome,
+and use the developer tools to inspect the different elements and see what you'd like to change and what classes
 to target when you do so.
 
-More custom skins will be available for download soon. If you have one you like you can share it by forking [this example on CodePen.io](http://codepen.io/heff/pen/EarCt), and adding a link on the [Skins wiki page](https://github.com/videojs/video.js/wiki/Skins).
+More custom skins will be available for download soon.
+If you have one you like you can share it by forking [this example on CodePen.io](http://codepen.io/heff/pen/EarCt),
+and adding a link on the [Skins wiki page](https://github.com/videojs/video.js/wiki/Skins).
diff --git a/lang/ar.json b/lang/ar.json
index 713cba055a..e74f989697 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -11,7 +11,7 @@
   "Fullscreen": "ملء الشاشة",
   "Non-Fullscreen": "غير ملء الشاشة",
   "Mute": "صامت",
-  "Unmuted": "غير الصامت",
+  "Unmute": "غير الصامت",
   "Playback Rate": "معدل التشغيل",
   "Subtitles": "الترجمة",
   "subtitles off": "ايقاف الترجمة",
@@ -22,5 +22,13 @@
   "A network error caused the media download to fail part-way.": "تسبب خطأ في الشبكة بفشل تحميل الفيديو بالكامل.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "لا يمكن تحميل الفيديو بسبب فشل في الخادم أو الشبكة ، أو فشل بسبب عدم امكانية قراءة تنسيق الفيديو.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "تم ايقاف تشغيل الفيديو بسبب مشكلة فساد أو لأن الفيديو المستخدم يستخدم ميزات غير مدعومة من متصفحك.",
-  "No compatible source was found for this media.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو."
+  "No compatible source was found for this media.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو.",
+  "Play Video": "تشغيل الفيديو",
+  "Close": "أغلق",
+  "Modal Window": "نافذة مشروطة",
+  "This is a modal window": "هذه نافذة مشروطة",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "يمكن غلق هذه النافذة المشروطة عن طريق الضغط على زر الخروج أو تفعيل زر الإغلاق",
+  ", opens captions settings dialog": ", تفتح نافذة  خيارات التعليقات",
+  ", opens subtitles settings dialog": ", تفتح نافذة  خيارات الترجمة",
+  ", selected": ", مختار"
 }
diff --git a/lang/ba.json b/lang/ba.json
index 4870516787..ba836f4fd7 100644
--- a/lang/ba.json
+++ b/lang/ba.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",
diff --git a/lang/bg.json b/lang/bg.json
index 7cfb14c241..31fc3e9655 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Цял екран",
   "Non-Fullscreen": "Спиране на цял екран",
   "Mute": "Без звук",
-  "Unmuted": "Със звук",
+  "Unmute": "Със звук",
   "Playback Rate": "Скорост на възпроизвеждане",
   "Subtitles": "Субтитри",
   "subtitles off": "Спряни субтитри",
diff --git a/lang/ca.json b/lang/ca.json
index b36a2307cd..45da60d743 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silencia",
-  "Unmuted": "Amb so",
+  "Unmute": "Amb so",
   "Playback Rate": "Velocitat de reproducció",
   "Subtitles": "Subtítols",
   "subtitles off": "Subtítols desactivats",
diff --git a/lang/cs.json b/lang/cs.json
index cb34851c28..99a7b653b2 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Celá obrazovka",
   "Non-Fullscreen": "Zmenšená obrazovka",
   "Mute": "Ztlumit zvuk",
-  "Unmuted": "Přehrát zvuk",
+  "Unmute": "Přehrát zvuk",
   "Playback Rate": "Rychlost přehrávání",
   "Subtitles": "Titulky",
   "subtitles off": "Titulky vypnuty",
diff --git a/lang/da.json b/lang/da.json
index 8931f7801d..b0cbf48564 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Fuldskærm",
   "Non-Fullscreen": "Luk fuldskærm",
   "Mute": "Uden lyd",
-  "Unmuted": "Med lyd",
+  "Unmute": "Med lyd",
   "Playback Rate": "Afspilningsrate",
   "Subtitles": "Undertekster",
   "subtitles off": "Uden undertekster",
diff --git a/lang/de.json b/lang/de.json
index fe397bafc5..4bc84dcaac 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Vollbild",
   "Non-Fullscreen": "Kein Vollbild",
   "Mute": "Ton aus",
-  "Unmuted": "Ton ein",
+  "Unmute": "Ton ein",
   "Playback Rate": "Wiedergabegeschwindigkeit",
   "Subtitles": "Untertitel",
   "subtitles off": "Untertitel aus",
@@ -22,5 +22,13 @@
   "A network error caused the media download to fail part-way.": "Der Videodownload ist aufgrund eines Netzwerkfehlers fehlgeschlagen.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Das Video konnte nicht geladen werden, da entweder ein Server- oder Netzwerkfehler auftrat oder das Format nicht unterstützt wird.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Die Videowiedergabe wurde entweder wegen eines Problems mit einem beschädigten Video oder wegen verwendeten Funktionen, die vom Browser nicht unterstützt werden, abgebrochen.",
-  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden."
+  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden.",
+  "Play Video": "Video abspielen",
+  "Close": "Schließen",
+  "Modal Window": "Modales Fenster",
+  "This is a modal window": "Dies ist ein modales Fenster",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Durch Drücken der Esc-Taste bzw. Betätigung der Schaltfläche \"Schließen\" wird dieses modale Fenster geschlossen.",
+  ", opens captions settings dialog": ", öffnet Einstellungen für Untertitel",
+  ", opens subtitles settings dialog": ", öffnet Einstellungen für Untertitel",
+  ", selected": " (ausgewählt)"
 }
diff --git a/lang/el.json b/lang/el.json
new file mode 100644
index 0000000000..3de96d03d9
--- /dev/null
+++ b/lang/el.json
@@ -0,0 +1,34 @@
+{
+  "Play": "Aναπαραγωγή",
+  "Pause": "Παύση",
+  "Current Time": "Τρέχων χρόνος",
+  "Duration Time": "Συνολικός χρόνος",
+  "Remaining Time": "Υπολοιπόμενος χρόνος",
+  "Stream Type": "Τύπος ροής",
+  "LIVE": "ΖΩΝΤΑΝΑ",
+  "Loaded": "Φόρτωση επιτυχής",
+  "Progress": "Πρόοδος",
+  "Fullscreen": "Πλήρης οθόνη",
+  "Non-Fullscreen": "Έξοδος από πλήρη οθόνη",
+  "Mute": "Σίγαση",
+  "Unmute": "Kατάργηση σίγασης",
+  "Playback Rate": "Ρυθμός αναπαραγωγής",
+  "Subtitles": "Υπότιτλοι",
+  "subtitles off": "απόκρυψη υπότιτλων",
+  "Captions": "Λεζάντες",
+  "captions off": "απόκρυψη λεζάντων",
+  "Chapters": "Κεφάλαια",
+  "You aborted the media playback": "Ακυρώσατε την αναπαραγωγή",
+  "A network error caused the media download to fail part-way.": "Ένα σφάλμα δικτύου προκάλεσε την αποτυχία μεταφόρτωσης του αρχείου προς αναπαραγωγή.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Το αρχείο προς αναπαραγωγή δεν ήταν δυνατό να φορτωθεί είτε γιατί υπήρξε σφάλμα στον διακομιστή ή το δίκτυο, είτε γιατί ο τύπος του αρχείου δεν υποστηρίζεται.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Η αναπαραγωγή ακυρώθηκε είτε λόγω κατεστραμμένου αρχείου, είτε γιατί το αρχείο απαιτεί λειτουργίες που δεν υποστηρίζονται από το πρόγραμμα περιήγησης που χρησιμοποιείτε.",
+  "No compatible source was found for this media.": "Δεν βρέθηκε συμβατή πηγή αναπαραγωγής για το συγκεκριμένο αρχείο.",
+  "Play video": "Αναπαραγωγή βίντεο",
+  "Close": "Κλείσιμο",
+  "Modal Window": "Aναδυόμενο παράθυρο",
+  "This is a modal window": "Το παρών είναι ένα αναδυόμενο παράθυρο",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Αυτό το παράθυρο μπορεί να εξαφανιστεί πατώντας το πλήκτρο Escape ή πατώντας το κουμπί κλεισίματος.",
+  ", opens captions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις λεζάντες",
+  ", opens subtitles settings dialog": ", εμφανίζει τις ρυθμίσεις για τους υπότιτλους",
+  ", selected": ", επιλεγμένο"
+}
diff --git a/lang/en.json b/lang/en.json
new file mode 100644
index 0000000000..53f0d42243
--- /dev/null
+++ b/lang/en.json
@@ -0,0 +1,37 @@
+{
+  "Play": "Play",
+  "Pause": "Pause",
+  "Current Time": "Current Time",
+  "Duration Time": "Duration Time",
+  "Remaining Time": "Remaining Time",
+  "Stream Type": "Stream Type",
+  "LIVE": "LIVE",
+  "Loaded": "Loaded",
+  "Progress": "Progress",
+  "Fullscreen": "Fullscreen",
+  "Non-Fullscreen": "Non-Fullscreen",
+  "Mute": "Mute",
+  "Unmute": "Unmute",
+  "Playback Rate": "Playback Rate",
+  "Subtitles": "Subtitles",
+  "subtitles off": "subtitles off",
+  "Captions": "Captions",
+  "captions off": "captions off",
+  "Chapters": "Chapters",
+  "Descriptions": "Descriptions",
+  "descriptions off": "descriptions off",
+  "You aborted the media playback": "You aborted the media playback",
+  "A network error caused the media download to fail part-way.": "A network error caused the media download to fail part-way.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "The media could not be loaded, either because the server or network failed or because the format is not supported.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.",
+  "No compatible source was found for this media.": "No compatible source was found for this media.",
+  "Play Video": "Play Video",
+  "Close": "Close",
+  "Modal Window": "Modal Window",
+  "This is a modal window": "This is a modal window",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "This modal can be closed by pressing the Escape key or activating the close button.",
+  ", opens captions settings dialog": ", opens captions settings dialog",
+  ", opens subtitles settings dialog": ", opens subtitles settings dialog",
+  ", opens descriptions settings dialog": ", opens descriptions settings dialog",
+  ", selected": ", selected"
+}
diff --git a/lang/es.json b/lang/es.json
index 3df4935041..0fb1482b20 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
   "Playback Rate": "Velocidad de reproducción",
   "Subtitles": "Subtítulos",
   "subtitles off": "Subtítulos desactivados",
diff --git a/lang/fa.json b/lang/fa.json
new file mode 100644
index 0000000000..7c89872cb0
--- /dev/null
+++ b/lang/fa.json
@@ -0,0 +1,26 @@
+{
+  "Play": "پخش",
+  "Pause": "وقفه",
+  "Current Time": "زمان کنونی",
+  "Duration Time": "مدت زمان",
+  "Remaining Time": "زمان باقیمانده",
+  "Stream Type": "نوع استریم",
+  "LIVE": "زنده",
+  "Loaded": "فراخوانی شده",
+  "Progress": "پیشرفت",
+  "Fullscreen": "تمام صفحه",
+  "Non-Fullscreen": "نمایش عادی",
+  "Mute": "بی صدا",
+  "Unmute": "بهمراه صدا",
+  "Playback Rate": "سرعت پخش",
+  "Subtitles": "زیرنویس",
+  "subtitles off": "بدون زیرنویس",
+  "Captions": "عنوان",
+  "captions off": "بدون عنوان",
+  "Chapters": "فصل",
+  "You aborted the media playback": "شما پخش را متوقف کردید.",
+  "A network error caused the media download to fail part-way.": "مشکل در دریافت ویدئو ...",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "فرمت پشتیبانی نمیشود یا خطایی روی داده است.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "مشکل در دریافت ویدئو ...",
+  "No compatible source was found for this media.": "هیچ ورودی ای برای این رسانه شناسایی نشد."
+}
diff --git a/lang/fi.json b/lang/fi.json
index 5cb08776e0..436ad3b5aa 100644
--- a/lang/fi.json
+++ b/lang/fi.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Koko näyttö",
   "Non-Fullscreen": "Koko näyttö pois",
   "Mute": "Ääni pois",
-  "Unmuted": "Ääni päällä",
+  "Unmute": "Ääni päällä",
   "Playback Rate": "Toistonopeus",
   "Subtitles": "Tekstitys",
   "subtitles off": "Tekstitys pois",
diff --git a/lang/fr.json b/lang/fr.json
index 230f990762..eb6cf98702 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Plein écran",
   "Non-Fullscreen": "Fenêtré",
   "Mute": "Sourdine",
-  "Unmuted": "Son activé",
+  "Unmute": "Son activé",
   "Playback Rate": "Vitesse de lecture",
   "Subtitles": "Sous-titres",
   "subtitles off": "Sous-titres désactivés",
diff --git a/lang/hr.json b/lang/hr.json
index 4870516787..ba836f4fd7 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",
diff --git a/lang/hu.json b/lang/hu.json
index 5a9052169d..4078174a84 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Teljes képernyő",
   "Non-Fullscreen": "Normál méret",
   "Mute": "Némítás",
-  "Unmuted": "Némítás kikapcsolva",
+  "Unmute": "Némítás kikapcsolva",
   "Playback Rate": "Lejátszási sebesség",
   "Subtitles": "Feliratok",
   "subtitles off": "Feliratok kikapcsolva",
diff --git a/lang/it.json b/lang/it.json
index 14b9643e6d..14f97033c3 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Schermo intero",
   "Non-Fullscreen": "Chiudi schermo intero",
   "Mute": "Muto",
-  "Unmuted": "Audio",
+  "Unmute": "Audio",
   "Playback Rate": "Tasso di riproduzione",
   "Subtitles": "Sottotitoli",
   "subtitles off": "Senza sottotitoli",
diff --git a/lang/ja.json b/lang/ja.json
index 448f16f45f..3731067a67 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -11,7 +11,7 @@
   "Fullscreen": "フルスクリーン",
   "Non-Fullscreen": "フルスクリーン以外",
   "Mute": "ミュート",
-  "Unmuted": "ミュート解除",
+  "Unmute": "ミュート解除",
   "Playback Rate": "再生レート",
   "Subtitles": "サブタイトル",
   "subtitles off": "サブタイトル オフ",
diff --git a/lang/ko.json b/lang/ko.json
index 3d1b100015..3198167369 100644
--- a/lang/ko.json
+++ b/lang/ko.json
@@ -11,7 +11,7 @@
   "Fullscreen": "전체 화면",
   "Non-Fullscreen": "전체 화면 해제",
   "Mute": "음소거",
-  "Unmuted": "음소거 해제",
+  "Unmute": "음소거 해제",
   "Playback Rate": "재생 비율",
   "Subtitles": "서브타이틀",
   "subtitles off": "서브타이틀 끄기",
diff --git a/lang/nb.json b/lang/nb.json
index 22eb7a5400..613fd6e4dd 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskjerm",
   "Non-Fullscreen": "Lukk fullskjerm",
   "Mute": "Lyd av",
-  "Unmuted": "Lyd på",
+  "Unmute": "Lyd på",
   "Playback Rate": "Avspillingsrate",
   "Subtitles": "Undertekst på",
   "subtitles off": "Undertekst av",
diff --git a/lang/nl.json b/lang/nl.json
index 55297c2e6c..4b1e772613 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Volledig scherm",
   "Non-Fullscreen": "Geen volledig scherm",
   "Mute": "Geluid uit",
-  "Unmuted": "Geluid aan",
+  "Unmute": "Geluid aan",
   "Playback Rate": "Weergavesnelheid",
   "Subtitles": "Ondertiteling",
   "subtitles off": "Ondertiteling uit",
diff --git a/lang/nn.json b/lang/nn.json
index 998e3a8a86..ded1e87b04 100644
--- a/lang/nn.json
+++ b/lang/nn.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskjerm",
   "Non-Fullscreen": "Stenga fullskjerm",
   "Mute": "Ljod av",
-  "Unmuted": "Ljod på",
+  "Unmute": "Ljod på",
   "Playback Rate": "Avspelingsrate",
   "Subtitles": "Teksting på",
   "subtitles off": "Teksting av",
diff --git a/lang/pl.json b/lang/pl.json
new file mode 100644
index 0000000000..707d91d98c
--- /dev/null
+++ b/lang/pl.json
@@ -0,0 +1,34 @@
+{
+  "Play": "Odtwarzaj",
+  "Pause": "Pauza",
+  "Current Time": "Aktualny czas",
+  "Duration Time": "Czas trwania",
+  "Remaining Time": "Pozostały czas",
+  "Stream Type": "Typ strumienia",
+  "LIVE": "NA ŻYWO",
+  "Loaded": "Załadowany",
+  "Progress": "Status",
+  "Fullscreen": "Pełny ekran",
+  "Non-Fullscreen": "Pełny ekran niedostępny",
+  "Mute": "Wyłącz dźwięk",
+  "Unmute": "Włącz dźwięk",
+  "Playback Rate": "Szybkość odtwarzania",
+  "Subtitles": "Napisy",
+  "subtitles off": "Napisy wyłączone",
+  "Captions": "Transkrypcja",
+  "captions off": "Transkrypcja wyłączona",
+  "Chapters": "Rozdziały",
+  "You aborted the media playback": "Odtwarzanie zostało przerwane",
+  "A network error caused the media download to fail part-way.": "Problemy z siecią spowodowały błąd przy pobieraniu materiału wideo.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Materiał wideo nie może być załadowany, ponieważ wystąpił problem z siecią lub format nie jest obsługiwany",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Odtwarzanie materiału wideo zostało przerwane z powodu uszkodzonego pliku wideo lub z powodu błędu funkcji, które nie są wspierane przez przeglądarkę.",
+  "No compatible source was found for this media.": "Dla tego materiału wideo nie znaleziono kompatybilnego źródła.",
+  "Play video": "Odtwarzaj wideo",
+  "Close": "Zamknij",
+  "Modal Window": "Okno Modala",
+  "This is a modal window": "To jest okno modala",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Ten modal możesz zamknąć naciskając przycisk Escape albo wybierając przycisk Zamknij.",
+  ", opens captions settings dialog": ", otwiera okno dialogowe ustawień transkrypcji",
+  ", opens subtitles settings dialog": ", otwiera okno dialogowe napisów",
+  ", selected": ", zaznaczone"
+}
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index 2e782d59fb..854982e176 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Tela Cheia",
   "Non-Fullscreen": "Tela Normal",
   "Mute": "Mudo",
-  "Unmuted": "Habilitar Som",
+  "Unmute": "Habilitar Som",
   "Playback Rate": "Velocidade",
   "Subtitles": "Legendas",
   "subtitles off": "Sem Legendas",
diff --git a/lang/ru.json b/lang/ru.json
index c3a0ab3991..7e7e7adcf3 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1,26 +1,26 @@
 {
- "Play": "Воспроизвести",
- "Pause": "Приостановить",
- "Current Time": "Текущее время",
- "Duration Time": "Продолжительность",
- "Remaining Time": "Оставшееся время",
- "Stream Type": "Тип потока",
- "LIVE": "ОНЛАЙН",
- "Loaded": "Загрузка",
- "Progress": "Прогресс",
- "Fullscreen": "Полноэкранный режим",
- "Non-Fullscreen": "Неполноэкранный режим",
- "Mute": "Без звука",
- "Unmuted": "Со звуком",
- "Playback Rate": "Скорость воспроизведения",
- "Subtitles": "Субтитры",
- "subtitles off": "Субтитры выкл.",
- "Captions": "Подписи",
- "captions off": "Подписи выкл.",
- "Chapters": "Главы",
- "You aborted the media playback": "Вы прервали воспроизведение видео",
- "A network error caused the media download to fail part-way.": "Ошибка сети вызвала сбой во время загрузки видео.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Невозможно загрузить видео из-за сетевого или серверного сбоя либо формат не поддерживается.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Воспроизведение видео было приостановлено из-за повреждения либо в связи с тем, что видео использует функции, неподдерживаемые вашим браузером.",
- "No compatible source was found for this media.": "Совместимые источники для этого видео отсутствуют."
+  "Play": "Воспроизвести",
+  "Pause": "Приостановить",
+  "Current Time": "Текущее время",
+  "Duration Time": "Продолжительность",
+  "Remaining Time": "Оставшееся время",
+  "Stream Type": "Тип потока",
+  "LIVE": "ОНЛАЙН",
+  "Loaded": "Загрузка",
+  "Progress": "Прогресс",
+  "Fullscreen": "Полноэкранный режим",
+  "Non-Fullscreen": "Неполноэкранный режим",
+  "Mute": "Без звука",
+  "Unmute": "Со звуком",
+  "Playback Rate": "Скорость воспроизведения",
+  "Subtitles": "Субтитры",
+  "subtitles off": "Субтитры выкл.",
+  "Captions": "Подписи",
+  "captions off": "Подписи выкл.",
+  "Chapters": "Главы",
+  "You aborted the media playback": "Вы прервали воспроизведение видео",
+  "A network error caused the media download to fail part-way.": "Ошибка сети вызвала сбой во время загрузки видео.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Невозможно загрузить видео из-за сетевого или серверного сбоя либо формат не поддерживается.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Воспроизведение видео было приостановлено из-за повреждения либо в связи с тем, что видео использует функции, неподдерживаемые вашим браузером.",
+  "No compatible source was found for this media.": "Совместимые источники для этого видео отсутствуют."
 }
diff --git a/lang/sr.json b/lang/sr.json
index 4870516787..ba836f4fd7 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",
diff --git a/lang/sv.json b/lang/sv.json
index e3072527dc..ebd1e7a8bb 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskärm",
   "Non-Fullscreen": "Ej fullskärm",
   "Mute": "Ljud av",
-  "Unmuted": "Ljud på",
+  "Unmute": "Ljud på",
   "Playback Rate": "Uppspelningshastighet",
   "Subtitles": "Text på",
   "subtitles off": "Text av",
diff --git a/lang/tr.json b/lang/tr.json
index 443e5ff761..d3b01a7fd7 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -1,26 +1,34 @@
 {
- "Play": "Oynat",
- "Pause": "Duraklat",
- "Current Time": "Süre",
- "Duration Time": "Toplam Süre",
- "Remaining Time": "Kalan Süre",
- "Stream Type": "Yayın Tipi",
- "LIVE": "CANLI",
- "Loaded": "Yüklendi",
- "Progress": "Yükleniyor",
- "Fullscreen": "Tam Ekran",
- "Non-Fullscreen": "Küçük Ekran",
- "Mute": "Ses Kapa",
- "Unmuted": "Ses Aç",
- "Playback Rate": "Oynatma Hızı",
- "Subtitles": "Altyazı",
- "subtitles off": "Altyazı Kapat",
- "Captions": "Ek Açıklamalar",
- "captions off": "Ek Açıklamalar Kapalı",
- "Chapters": "Bölümler",
- "You aborted the media playback": "Video oynatmayı iptal ettiniz",
- "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
- "No compatible source was found for this media.": "Video için kaynak bulunamadı."
+  "Play": "Oynat",
+  "Pause": "Duraklat",
+  "Current Time": "Süre",
+  "Duration Time": "Toplam Süre",
+  "Remaining Time": "Kalan Süre",
+  "Stream Type": "Yayın Tipi",
+  "LIVE": "CANLI",
+  "Loaded": "Yüklendi",
+  "Progress": "Yükleniyor",
+  "Fullscreen": "Tam Ekran",
+  "Non-Fullscreen": "Küçük Ekran",
+  "Mute": "Ses Kapa",
+  "Unmute": "Ses Aç",
+  "Playback Rate": "Oynatma Hızı",
+  "Subtitles": "Altyazı",
+  "subtitles off": "Altyazı Kapalı",
+  "Captions": "Ek Açıklamalar",
+  "captions off": "Ek Açıklamalar Kapalı",
+  "Chapters": "Bölümler",
+  "You aborted the media playback": "Video oynatmayı iptal ettiniz",
+  "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
+  "No compatible source was found for this media.": "Video için kaynak bulunamadı.",
+  "Play Video": "Videoyu Oynat",
+  "Close": "Kapat",
+  "Modal Window": "Modal Penceresi",
+  "This is a modal window": "Bu bir modal penceresidir",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Bu modal ESC tuşuna basarak ya da kapata tıklanarak kapatılabilir.",
+  ", opens captions settings dialog": ", ek açıklama ayarları menüsünü açar",
+  ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar",
+  ", selected": ", seçildi"
 }
diff --git a/lang/uk.json b/lang/uk.json
index 005c4013bf..c082417c2e 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -1,26 +1,26 @@
 {
- "Play": "Відтворити",
- "Pause": "Призупинити",
- "Current Time": "Поточний час",
- "Duration Time": "Тривалість",
- "Remaining Time": "Час, що залишився",
- "Stream Type": "Тип потоку",
- "LIVE": "НАЖИВО",
- "Loaded": "Завантаження",
- "Progress": "Прогрес",
- "Fullscreen": "Повноекранний режим",
- "Non-Fullscreen": "Неповноекранний режим",
- "Mute": "Без звуку",
- "Unmuted": "Зі звуком",
- "Playback Rate": "Швидкість відтворення",
- "Subtitles": "Субтитри",
- "subtitles off": "Без субтитрів",
- "Captions": "Підписи",
- "captions off": "Без підписів",
- "Chapters": "Розділи",
- "You aborted the media playback": "Ви припинили відтворення відео",
- "A network error caused the media download to fail part-way.": "Помилка мережі викликала збій під час завантаження відео.",
- "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Неможливо завантажити відео через мережевий чи серверний збій або формат не підтримується.",
- "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Відтворення відео було припинено через пошкодження або у зв'язку з тим, що відео використовує функції, які не підтримуються вашим браузером.",
- "No compatible source was found for this media.": "Сумісні джерела для цього відео відсутні."
+  "Play": "Відтворити",
+  "Pause": "Призупинити",
+  "Current Time": "Поточний час",
+  "Duration Time": "Тривалість",
+  "Remaining Time": "Час, що залишився",
+  "Stream Type": "Тип потоку",
+  "LIVE": "НАЖИВО",
+  "Loaded": "Завантаження",
+  "Progress": "Прогрес",
+  "Fullscreen": "Повноекранний режим",
+  "Non-Fullscreen": "Неповноекранний режим",
+  "Mute": "Без звуку",
+  "Unmute": "Зі звуком",
+  "Playback Rate": "Швидкість відтворення",
+  "Subtitles": "Субтитри",
+  "subtitles off": "Без субтитрів",
+  "Captions": "Підписи",
+  "captions off": "Без підписів",
+  "Chapters": "Розділи",
+  "You aborted the media playback": "Ви припинили відтворення відео",
+  "A network error caused the media download to fail part-way.": "Помилка мережі викликала збій під час завантаження відео.",
+  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Неможливо завантажити відео через мережевий чи серверний збій або формат не підтримується.",
+  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Відтворення відео було припинено через пошкодження або у зв'язку з тим, що відео використовує функції, які не підтримуються вашим браузером.",
+  "No compatible source was found for this media.": "Сумісні джерела для цього відео відсутні."
 }
diff --git a/lang/vi.json b/lang/vi.json
index cfc0de7a1f..698b4fe0c6 100644
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -11,7 +11,7 @@
   "Fullscreen": "Toàn màn hình",
   "Non-Fullscreen": "Thoát toàn màn hình",
   "Mute": "Tắt tiếng",
-  "Unmuted": "Bật âm thanh",
+  "Unmute": "Bật âm thanh",
   "Playback Rate": "Tốc độ phát",
   "Subtitles": "Phụ đề",
   "subtitles off": "Tắt phụ đề",
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 4b5bbb9667..99e57c00f4 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -11,7 +11,7 @@
   "Fullscreen": "全屏",
   "Non-Fullscreen": "退出全屏",
   "Mute": "静音",
-  "Unmuted": "取消静音",
+  "Unmute": "取消静音",
   "Playback Rate": "播放码率",
   "Subtitles": "字幕",
   "subtitles off": "字幕关闭",
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
index bfc6bc26cc..4a73fd8712 100644
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@@ -11,7 +11,7 @@
   "Fullscreen": "全螢幕",
   "Non-Fullscreen": "退出全螢幕",
   "Mute": "靜音",
-  "Unmuted": "取消靜音",
+  "Unmute": "取消靜音",
   "Playback Rate": " 播放速率",
   "Subtitles": "字幕",
   "subtitles off": "關閉字幕",
diff --git a/package.json b/package.json
index 68f96d5239..0d66e931c4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.6.0",
+  "version": "5.9.2",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [
diff --git a/sandbox/descriptions.html.example b/sandbox/descriptions.html.example
new file mode 100644
index 0000000000..c12c2c03e0
--- /dev/null
+++ b/sandbox/descriptions.html.example
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>Video.js Text Descriptions, Chapters &amp; Captions Example</title>
+
+  <!-- Add ES5 shim and sham for IE8 -->
+  <script src="../build/temp/ie8/videojs-ie8.js"></script>
+
+  <!-- Load the source files -->
+  <link href="../build/temp/video-js.css" rel="stylesheet" type="text/css">
+  <script src="../build/temp/video.js"></script>
+
+  <!-- Set the location of the flash SWF -->
+  <script>
+    videojs.options.flash.swf = '../build/temp/video-js.swf';
+  </script>
+
+</head>
+<body>
+  <!-- NOTE: we have to disable native Text Track support for the HTML5 tech,
+             since even HTML5 video players with native Text Track support
+             don't currently support 'description' text tracks in any
+             useful way! -->
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="360"
+      data-setup='{ "html5" : { "nativeTextTracks" : false } }'>
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.mp4" type="video/mp4">
+    <source src="https://archive.org/download/ElephantsDream/ed_hd.ogv" type="video/ogv">
+
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.en.vtt" srclang="en" label="English" default></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.sv.vtt" srclang="sv" label="Swedish"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ru.vtt" srclang="ru" label="Russian"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ja.vtt" srclang="ja" label="Japanese"></track>
+    <track kind="captions" src="../docs/examples/elephantsdream/captions.ar.vtt" srclang="ar" label="Arabic"></track>
+
+    <track kind="descriptions" src="../docs/examples/elephantsdream/descriptions.en.vtt" srclang="en" label="English"></track>
+
+    <track kind="chapters" src="../docs/examples/elephantsdream/chapters.en.vtt" srclang="en" label="English"></track>
+
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
+  </video>
+</body>
+</html>
diff --git a/sandbox/index.html.example b/sandbox/index.html.example
index 438bedefe8..942d1e779d 100644
--- a/sandbox/index.html.example
+++ b/sandbox/index.html.example
@@ -37,7 +37,7 @@
   </video>
 
   <script>
-    vid = document.getElementById("vid1");
+    var vid = document.getElementById("vid1");
   </script>
 
 </body>
diff --git a/sandbox/language.html.example b/sandbox/language.html.example
index e70d00e3ff..b3f929d3f7 100644
--- a/sandbox/language.html.example
+++ b/sandbox/language.html.example
@@ -32,7 +32,7 @@
       "Fullscreen": "Pantalla Completa",
       "Non-Fullscreen": "No Pantalla Completa",
       "Mute": "Mudo",
-      "Unmuted": "Activar sonido",
+      "Unmute": "Activar sonido",
       "Playback Rate": "Reproduccion Cambio",
       "Subtitles": "Subtitulos",
       "subtitles off": "subtitulos fuera",
diff --git a/src/css/components/_adaptive.scss b/src/css/components/_adaptive.scss
index d8c01d8056..3f0b801549 100644
--- a/src/css/components/_adaptive.scss
+++ b/src/css/components/_adaptive.scss
@@ -5,10 +5,10 @@
   .vjs-custom-control-spacer { @include flex(auto); }
   &.vjs-no-flex .vjs-custom-control-spacer { width: auto; }
 
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-progress-control, .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button, .vjs-captions-button,
-  .vjs-subtitles-button, .vjs-volume-menu-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate, .vjs-progress-control,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }
 
 // When the player is x-small, display nothing but:
@@ -16,10 +16,10 @@
 // - Progress bar
 // - Fullscreen Button
 .video-js.vjs-layout-x-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate, .vjs-captions-button,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button, .vjs-volume-button, .vjs-fullscreen-control { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }
 
 
@@ -30,8 +30,8 @@
 // - Captions Button
 // - Fullscreen button
 .video-js.vjs-layout-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }
diff --git a/src/css/components/_chapters.scss b/src/css/components/_chapters.scss
index b70b018ee0..91695452f5 100644
--- a/src/css/components/_chapters.scss
+++ b/src/css/components/_chapters.scss
@@ -2,11 +2,6 @@
   @extend .vjs-icon-chapters;
 }
 
-.vjs-chapters-button .vjs-menu {
-  left: -10em; // (Width of vjs-menu - width of vjs-control) / 2
-  width: 0;
-}
-
 .vjs-chapters-button .vjs-menu ul {
   width: 24em;
 }
diff --git a/src/css/components/_control-bar.scss b/src/css/components/_control-bar.scss
index be09029cb8..8a3a54cb92 100644
--- a/src/css/components/_control-bar.scss
+++ b/src/css/components/_control-bar.scss
@@ -46,7 +46,7 @@
 // fonts to show/hide properly.
 // - "\9" IE8 hack didn't work for this
 // Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
-$ie8screen: "\0screen";
+$ie8screen: "\\0screen";
 .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
   @media #{$ie8screen} { content: ""; }
 }
diff --git a/src/css/components/_descriptions.scss b/src/css/components/_descriptions.scss
new file mode 100644
index 0000000000..d298ef8205
--- /dev/null
+++ b/src/css/components/_descriptions.scss
@@ -0,0 +1,3 @@
+.video-js .vjs-descriptions-button {
+  @extend .vjs-icon-audio-description;
+}
diff --git a/src/css/components/_fullscreen.scss b/src/css/components/_fullscreen.scss
index f23f6748ad..b0c6b342e3 100644
--- a/src/css/components/_fullscreen.scss
+++ b/src/css/components/_fullscreen.scss
@@ -1,5 +1,4 @@
 .video-js .vjs-fullscreen-control {
-  width: 3.8em;
   cursor: pointer;
   @include flex(none);
 }
diff --git a/src/css/components/_layout.scss b/src/css/components/_layout.scss
index 14f2c2f52e..632325b379 100644
--- a/src/css/components/_layout.scss
+++ b/src/css/components/_layout.scss
@@ -124,6 +124,11 @@ body.vjs-full-window {
 // Hide disabled or unsupported controls.
 .vjs-hidden { display: none !important; }
 
+.vjs-disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
 // Visually hidden offscreen, but accessible to screen readers.
 .video-js .vjs-offscreen {
   height: 1px;
diff --git a/src/css/components/_poster.scss b/src/css/components/_poster.scss
index a029a307a7..e13a9e8b44 100644
--- a/src/css/components/_poster.scss
+++ b/src/css/components/_poster.scss
@@ -4,6 +4,7 @@
   background-repeat: no-repeat;
   background-position: 50% 50%;
   background-size: contain;
+  background-color: #000000;
   cursor: pointer;
   margin: 0;
   padding: 0;
diff --git a/src/css/components/_progress.scss b/src/css/components/_progress.scss
index 7ff1c6be51..ace8d26d77 100644
--- a/src/css/components/_progress.scss
+++ b/src/css/components/_progress.scss
@@ -15,6 +15,7 @@
 .video-js .vjs-progress-control {
   @include flex(auto);
   @include display-flex(center);
+  min-width: 4em;
 }
 
 .vjs-live .vjs-progress-control {
@@ -38,15 +39,18 @@
  to avoid a weird hitch when you roll off the hover. */
 
 // Also show the current time tooltip
+.video-js .vjs-progress-control:hover .vjs-time-tooltip,
 .video-js .vjs-progress-control:hover .vjs-mouse-display:after,
 .video-js .vjs-progress-control:hover .vjs-play-progress:after {
-  display: block;
+  font-family: $text-font-family;
+  visibility: visible;
   font-size: 0.6em;
 }
 
 // Progress Bars
 .video-js .vjs-progress-holder .vjs-play-progress,
 .video-js .vjs-progress-holder .vjs-load-progress,
+.video-js .vjs-progress-holder .vjs-tooltip-progress-bar,
 .video-js .vjs-progress-holder .vjs-load-progress div {
   position: absolute;
   display: block;
@@ -82,24 +86,32 @@
 
 // Current Time "tooltip"
 // By default this is hidden and only shown when hovering over the progress control
+.video-js .vjs-time-tooltip,
 .video-js .vjs-mouse-display:after,
 .video-js .vjs-play-progress:after {
-  display: none;
+  visibility: hidden;
+  pointer-events: none;
   position: absolute;
-  top: -2.4em;
-  right: -1.5em;
+  top: -3.4em;
+  right: -1.9em;
   font-size: 0.9em;
   color: #000;
   content: attr(data-current-time);
-  padding: 0.2em 0.5em;
+  padding: 6px 8px 8px 8px;
   @include background-color-with-alpha(#fff, 0.8);
   @include border-radius(0.3em);
 }
+
+.video-js .vjs-time-tooltip,
 .video-js .vjs-play-progress:before,
 .video-js .vjs-play-progress:after {
   z-index: 1;
 }
 
+.video-js .vjs-progress-control .vjs-keep-tooltips-inside:after {
+  display: none;
+}
+
 .video-js .vjs-load-progress {
   // For IE8 we'll lighten the color
   background: lighten($secondary-background-color, 25%);
@@ -120,6 +132,18 @@
   width: auto;
 }
 
+.video-js .vjs-time-tooltip {
+  display: inline-block;
+  height: 2.4em;
+  position: relative;
+  float: right;
+  right: -1.9em;
+}
+
+.vjs-tooltip-progress-bar {
+  visibility: hidden;
+}
+
 .video-js .vjs-progress-control .vjs-mouse-display {
   display: none;
   position: absolute;
@@ -145,6 +169,7 @@
 .video-js.vjs-user-inactive.vjs-no-flex .vjs-progress-control .vjs-mouse-display:after {
   display: none;
 }
+.vjs-mouse-display .vjs-time-tooltip,
 .video-js .vjs-progress-control .vjs-mouse-display:after {
   color: #fff;
   @include background-color-with-alpha(#000, 0.8);
diff --git a/src/css/components/_time.scss b/src/css/components/_time.scss
index 03f6ef1078..0144dacd7d 100644
--- a/src/css/components/_time.scss
+++ b/src/css/components/_time.scss
@@ -2,6 +2,10 @@
   @include flex(none);
   font-size: 1em;
   line-height: 3em;
+  min-width: 2em;
+  width: auto;
+  padding-left: 1em;
+  padding-right: 1em;
 }
 
 .vjs-live .vjs-time-control {
diff --git a/src/css/components/menu/_menu-popup.scss b/src/css/components/menu/_menu-popup.scss
index 4387780e84..6eb4722b1a 100644
--- a/src/css/components/menu/_menu-popup.scss
+++ b/src/css/components/menu/_menu-popup.scss
@@ -19,7 +19,7 @@
   max-height: 15em;
 }
 
-.vjs-menu-button-popup:hover .vjs-menu,
+.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
 .vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
   display: block;
 }
diff --git a/src/css/components/menu/_menu.scss b/src/css/components/menu/_menu.scss
index c4730c946e..e806f421c0 100644
--- a/src/css/components/menu/_menu.scss
+++ b/src/css/components/menu/_menu.scss
@@ -2,6 +2,16 @@
   cursor: pointer;
 }
 
+// Change cursor back to default if the menu button is disabled
+.vjs-menu-button.vjs-disabled {
+  cursor: default;
+}
+
+// prevent menus from opening while disabled
+.vjs-workinghover .vjs-menu-button.vjs-disabled:hover .vjs-menu {
+  display: none;
+}
+
 .vjs-menu .vjs-menu-content {
   display: block;
   padding: 0; margin: 0;
diff --git a/src/css/video-js.scss b/src/css/video-js.scss
index df1ec520f4..fd203bb4c9 100644
--- a/src/css/video-js.scss
+++ b/src/css/video-js.scss
@@ -3,9 +3,9 @@
 @import "utilities";
 
 @if $icon-codepoints {
-  @import "../../node_modules/videojs-font/scss/icons-codepoints";
+  @import "node_modules/videojs-font/scss/icons-codepoints";
 } @else {
-  @import "../../node_modules/videojs-font/scss/icons";
+  @import "node_modules/videojs-font/scss/icons";
 }
 
 @import "components/layout";
@@ -37,6 +37,7 @@
 @import "components/loading";
 @import "components/captions";
 @import "components/chapters";
+@import "components/descriptions";
 @import "components/subtitles";
 @import "components/adaptive";
 @import "components/captions-settings";
diff --git a/src/css/vjs-cdn.scss b/src/css/vjs-cdn.scss
new file mode 100644
index 0000000000..abf75b6b46
--- /dev/null
+++ b/src/css/vjs-cdn.scss
@@ -0,0 +1,3 @@
+$icon-font-path: '//vjs.zencdn.net/font/1.5.1';
+
+@import 'video-js';
diff --git a/src/js/button.js b/src/js/button.js
index a0fb2cf40f..54067cc02c 100644
--- a/src/js/button.js
+++ b/src/js/button.js
@@ -39,6 +39,16 @@ class Button extends ClickableComponent {
 
     if (tag !== 'button') {
       log.warn(`Creating a Button with an HTML element of ${tag} is deprecated; use ClickableComponent instead.`);
+
+      // Add properties for clickable element which is not a native HTML button
+      props = assign({
+        tabIndex: 0
+      }, props);
+
+      // Add ARIA attributes for clickable element which is not a native HTML button
+      attributes = assign({
+        role: 'button'
+      }, attributes);
     }
 
     // Add attributes for button element
diff --git a/src/js/clickable-component.js b/src/js/clickable-component.js
index cdb0012fda..3ee32f7018 100644
--- a/src/js/clickable-component.js
+++ b/src/js/clickable-component.js
@@ -129,6 +129,30 @@ class ClickableComponent extends Component {
     return super.addChild(child, options);
   }
 
+  /**
+   * Enable the component element
+   *
+   * @return {Component}
+   * @method enable
+   */
+  enable() {
+    this.removeClass('vjs-disabled');
+    this.el_.setAttribute('aria-disabled', 'false');
+    return this;
+  }
+
+  /**
+   * Disable the component element
+   *
+   * @return {Component}
+   * @method disable
+   */
+  disable() {
+    this.addClass('vjs-disabled');
+    this.el_.setAttribute('aria-disabled', 'true');
+    return this;
+  }
+
   /**
    * Handle Click - Override with specific functionality for component
    *
diff --git a/src/js/component.js b/src/js/component.js
index 4b5cc814b4..9ef9d0caf3 100644
--- a/src/js/component.js
+++ b/src/js/component.js
@@ -336,10 +336,11 @@ class Component {
    *
    * @param {String|Component} child The class name or instance of a child to add
    * @param {Object=} options Options, including options to be passed to children of the child.
+   * @param {Number} index into our children array to attempt to add the child
    * @return {Component} The child component (created by this process if a string was used)
    * @method addChild
    */
-  addChild(child, options={}) {
+  addChild(child, options={}, index=this.children_.length) {
     let component;
     let componentName;
 
@@ -388,7 +389,7 @@ class Component {
       component = child;
     }
 
-    this.children_.push(component);
+    this.children_.splice(index, 0, component);
 
     if (typeof component.id === 'function') {
       this.childIndex_[component.id()] = component;
@@ -405,7 +406,9 @@ class Component {
     // Add the UI object's element to the container div (box)
     // Having an element is not required
     if (typeof component.el === 'function' && component.el()) {
-      this.contentEl().appendChild(component.el());
+      let childNodes = this.contentEl().children;
+      let refNode = childNodes[index] || null;
+      this.contentEl().insertBefore(component.el(), refNode);
     }
 
     // Return so it can stored on parent object if desired.
@@ -1088,6 +1091,64 @@ class Component {
     return parseInt(this.el_['offset' + toTitleCase(widthOrHeight)], 10);
   }
 
+  /**
+   * Get width or height of computed style
+   * @param  {String} widthOrHeight  'width' or 'height'
+   * @return {Number|Boolean} The bolean false if nothing was set
+   * @method currentDimension
+   */
+  currentDimension(widthOrHeight) {
+    let computedWidthOrHeight = 0;
+
+    if (widthOrHeight !== 'width' && widthOrHeight !== 'height') {
+      throw new Error('currentDimension only accepts width or height value');
+    }
+
+    if (typeof window.getComputedStyle === 'function') {
+      const computedStyle = window.getComputedStyle(this.el_);
+      computedWidthOrHeight = computedStyle.getPropertyValue(widthOrHeight) || computedStyle[widthOrHeight];
+    } else if (this.el_.currentStyle) {
+      // ie 8 doesn't support computed style, shim it
+      // return clientWidth or clientHeight instead for better accuracy
+      const rule = `offset${toTitleCase(widthOrHeight)}`;
+      computedWidthOrHeight = this.el_[rule];
+    }
+
+    // remove 'px' from variable and parse as integer
+    computedWidthOrHeight = parseFloat(computedWidthOrHeight);
+    return computedWidthOrHeight;
+  }
+
+  /**
+   * Get an object which contains width and height values of computed style
+   * @return {Object} The dimensions of element
+   * @method currentDimensions
+   */
+  currentDimensions() {
+    return {
+      width: this.currentDimension('width'),
+      height: this.currentDimension('height')
+    };
+  }
+
+  /**
+   * Get width of computed style
+   * @return {Integer}
+   * @method currentWidth
+   */
+  currentWidth() {
+    return this.currentDimension('width');
+  }
+
+  /**
+   * Get height of computed style
+   * @return {Integer}
+   * @method currentHeight
+   */
+  currentHeight() {
+    return this.currentDimension('height');
+  }
+
   /**
    * Emit 'tap' events when touch events are supported
    * This is used to support toggling the controls through a tap on the video.
diff --git a/src/js/control-bar/control-bar.js b/src/js/control-bar/control-bar.js
index df0e4c433c..f8fc8f757b 100644
--- a/src/js/control-bar/control-bar.js
+++ b/src/js/control-bar/control-bar.js
@@ -16,6 +16,7 @@ import VolumeControl from './volume-control/volume-control.js';
 import VolumeMenuButton from './volume-menu-button.js';
 import MuteToggle from './mute-toggle.js';
 import ChaptersButton from './text-track-controls/chapters-button.js';
+import DescriptionsButton from './text-track-controls/descriptions-button.js';
 import SubtitlesButton from './text-track-controls/subtitles-button.js';
 import CaptionsButton from './text-track-controls/captions-button.js';
 import PlaybackRateMenuButton from './playback-rate-menu/playback-rate-menu-button.js';
@@ -37,7 +38,8 @@ class ControlBar extends Component {
    */
   createEl() {
     return super.createEl('div', {
-      className: 'vjs-control-bar'
+      className: 'vjs-control-bar',
+      dir: 'ltr'
     }, {
       'role': 'group' // The control bar is a group, so it can contain menuitems
     });
@@ -58,6 +60,7 @@ ControlBar.prototype.options_ = {
     'customControlSpacer',
     'playbackRateMenuButton',
     'chaptersButton',
+    'descriptionsButton',
     'subtitlesButton',
     'captionsButton',
     'fullscreenToggle'
diff --git a/src/js/control-bar/playback-rate-menu/playback-rate-menu-button.js b/src/js/control-bar/playback-rate-menu/playback-rate-menu-button.js
index fe02e06b1d..342c0aec16 100644
--- a/src/js/control-bar/playback-rate-menu/playback-rate-menu-button.js
+++ b/src/js/control-bar/playback-rate-menu/playback-rate-menu-button.js
@@ -119,9 +119,10 @@ class PlaybackRateMenuButton extends MenuButton {
   }
 
   /**
-   * Get supported playback rates
+   * Get whether playback rates is supported by the tech
+   * and an array of playback rates exists
    *
-   * @return {Array} Supported playback rates
+   * @return {Boolean} Whether changing playback rate is supported
    * @method playbackRateSupported
    */
   playbackRateSupported() {
diff --git a/src/js/control-bar/progress-control/mouse-time-display.js b/src/js/control-bar/progress-control/mouse-time-display.js
index b05d752ec5..e59be2caa4 100644
--- a/src/js/control-bar/progress-control/mouse-time-display.js
+++ b/src/js/control-bar/progress-control/mouse-time-display.js
@@ -1,6 +1,7 @@
 /**
  * @file mouse-time-display.js
  */
+import window from 'global/window';
 import Component from '../../component.js';
 import * as Dom from '../../utils/dom.js';
 import * as Fn from '../../utils/fn.js';
@@ -21,6 +22,19 @@ class MouseTimeDisplay extends Component {
   constructor(player, options) {
     super(player, options);
 
+    if (options.playerOptions &&
+        options.playerOptions.controlBar &&
+        options.playerOptions.controlBar.progressControl &&
+        options.playerOptions.controlBar.progressControl.keepTooltipsInside) {
+      this.keepTooltipsInside = options.playerOptions.controlBar.progressControl.keepTooltipsInside;
+    }
+
+    if (this.keepTooltipsInside) {
+      this.tooltip = Dom.createEl('div', {className: 'vjs-time-tooltip'});
+      this.el().appendChild(this.tooltip);
+      this.addClass('vjs-keep-tooltips-inside');
+    }
+
     this.update(0, 0);
 
     player.on('ready', () => {
@@ -53,11 +67,50 @@ class MouseTimeDisplay extends Component {
 
     this.el().style.left = position + 'px';
     this.el().setAttribute('data-current-time', time);
+
+    if (this.keepTooltipsInside) {
+      let clampedPosition = this.clampPosition_(position);
+      let difference = position - clampedPosition + 1;
+      let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
+      let tooltipWidthHalf = tooltipWidth / 2;
+
+      this.tooltip.innerHTML = time;
+      this.tooltip.style.right = `-${tooltipWidthHalf - difference}px`;
+    }
   }
 
   calculateDistance(event) {
     return Dom.getPointerPosition(this.el().parentNode, event).x;
   }
+
+  /**
+   * This takes in a horizontal position for the bar and returns a clamped position.
+   * Clamped position means that it will keep the position greater than half the width
+   * of the tooltip and smaller than the player width minus half the width o the tooltip.
+   * It will only clamp the position if `keepTooltipsInside` option is set.
+   *
+   * @param {Number} position the position the bar wants to be
+   * @return {Number} newPosition the (potentially) clamped position
+   * @method clampPosition_
+   */
+  clampPosition_(position) {
+    if (!this.keepTooltipsInside) {
+      return position;
+    }
+
+    let playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
+    let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
+    let tooltipWidthHalf = tooltipWidth / 2;
+    let actualPosition = position;
+
+    if (position < tooltipWidthHalf) {
+      actualPosition = Math.ceil(tooltipWidthHalf);
+    } else if (position > (playerWidth - tooltipWidthHalf)) {
+      actualPosition = Math.floor(playerWidth - tooltipWidthHalf);
+    }
+
+    return actualPosition;
+  }
 }
 
 Component.registerComponent('MouseTimeDisplay', MouseTimeDisplay);
diff --git a/src/js/control-bar/progress-control/play-progress-bar.js b/src/js/control-bar/progress-control/play-progress-bar.js
index 5236d11300..7ddea6cf45 100644
--- a/src/js/control-bar/progress-control/play-progress-bar.js
+++ b/src/js/control-bar/progress-control/play-progress-bar.js
@@ -3,6 +3,7 @@
  */
 import Component from '../../component.js';
 import * as Fn from '../../utils/fn.js';
+import * as Dom from '../../utils/dom.js';
 import formatTime from '../../utils/format-time.js';
 
 /**
@@ -20,6 +21,17 @@ class PlayProgressBar extends Component {
     this.updateDataAttr();
     this.on(player, 'timeupdate', this.updateDataAttr);
     player.ready(Fn.bind(this, this.updateDataAttr));
+
+    if (options.playerOptions &&
+        options.playerOptions.controlBar &&
+        options.playerOptions.controlBar.progressControl &&
+        options.playerOptions.controlBar.progressControl.keepTooltipsInside) {
+      this.keepTooltipsInside = options.playerOptions.controlBar.progressControl.keepTooltipsInside;
+    }
+
+    if (this.keepTooltipsInside) {
+      this.addClass('vjs-keep-tooltips-inside');
+    }
   }
 
   /**
diff --git a/src/js/control-bar/progress-control/seek-bar.js b/src/js/control-bar/progress-control/seek-bar.js
index 09176fbde7..21fdc15adb 100644
--- a/src/js/control-bar/progress-control/seek-bar.js
+++ b/src/js/control-bar/progress-control/seek-bar.js
@@ -1,10 +1,12 @@
 /**
  * @file seek-bar.js
  */
+import window from 'global/window';
 import Slider from '../../slider/slider.js';
 import Component from '../../component.js';
 import LoadProgressBar from './load-progress-bar.js';
 import PlayProgressBar from './play-progress-bar.js';
+import TooltipProgressBar from './tooltip-progress-bar.js';
 import * as Fn from '../../utils/fn.js';
 import formatTime from '../../utils/format-time.js';
 import assign from 'object.assign';
@@ -21,8 +23,20 @@ class SeekBar extends Slider {
 
   constructor(player, options){
     super(player, options);
-    this.on(player, 'timeupdate', this.updateARIAAttributes);
-    player.ready(Fn.bind(this, this.updateARIAAttributes));
+    this.on(player, 'timeupdate', this.updateProgress);
+    this.on(player, 'ended', this.updateProgress);
+    player.ready(Fn.bind(this, this.updateProgress));
+
+    if (options.playerOptions &&
+        options.playerOptions.controlBar &&
+        options.playerOptions.controlBar.progressControl &&
+        options.playerOptions.controlBar.progressControl.keepTooltipsInside) {
+      this.keepTooltipsInside = options.playerOptions.controlBar.progressControl.keepTooltipsInside;
+    }
+
+    if (this.keepTooltipsInside) {
+      this.tooltipProgressBar = this.addChild('TooltipProgressBar');
+    }
   }
 
   /**
@@ -35,7 +49,7 @@ class SeekBar extends Slider {
     return super.createEl('div', {
       className: 'vjs-progress-holder'
     }, {
-      'aria-label': 'video progress bar'
+      'aria-label': 'progress bar'
     });
   }
 
@@ -44,11 +58,27 @@ class SeekBar extends Slider {
    *
    * @method updateARIAAttributes
    */
-  updateARIAAttributes() {
-      // Allows for smooth scrubbing, when player can't keep up.
-      let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
-      this.el_.setAttribute('aria-valuenow', (this.getPercent() * 100).toFixed(2)); // machine readable value of progress bar (percentage complete)
-      this.el_.setAttribute('aria-valuetext', formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
+  updateProgress() {
+    this.updateAriaAttributes(this.el_);
+
+    if (this.keepTooltipsInside) {
+      this.updateAriaAttributes(this.tooltipProgressBar.el_);
+      this.tooltipProgressBar.el_.style.width = this.bar.el_.style.width;
+
+      let playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
+      let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltipProgressBar.tooltip).width);
+      let tooltipStyle = this.tooltipProgressBar.el().style;
+      tooltipStyle.maxWidth = Math.floor(playerWidth - (tooltipWidth / 2)) + 'px';
+      tooltipStyle.minWidth = Math.ceil(tooltipWidth / 2) + 'px';
+      tooltipStyle.right = `-${tooltipWidth / 2}px`;
+    }
+  }
+
+  updateAriaAttributes(el) {
+    // Allows for smooth scrubbing, when player can't keep up.
+    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    el.setAttribute('aria-valuenow', (this.getPercent() * 100).toFixed(2)); // machine readable value of progress bar (percentage complete)
+    el.setAttribute('aria-valuetext', formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
   }
 
   /**
diff --git a/src/js/control-bar/progress-control/tooltip-progress-bar.js b/src/js/control-bar/progress-control/tooltip-progress-bar.js
new file mode 100644
index 0000000000..f1e092dad3
--- /dev/null
+++ b/src/js/control-bar/progress-control/tooltip-progress-bar.js
@@ -0,0 +1,54 @@
+/**
+ * @file play-progress-bar.js
+ */
+import Component from '../../component.js';
+import * as Fn from '../../utils/fn.js';
+import * as Dom from '../../utils/dom.js';
+import formatTime from '../../utils/format-time.js';
+
+/**
+ * Shows play progress
+ *
+ * @param {Player|Object} player
+ * @param {Object=} options
+ * @extends Component
+ * @class PlayProgressBar
+ */
+class TooltipProgressBar extends Component {
+
+  constructor(player, options){
+    super(player, options);
+    this.updateDataAttr();
+    this.on(player, 'timeupdate', this.updateDataAttr);
+    player.ready(Fn.bind(this, this.updateDataAttr));
+  }
+
+  /**
+   * Create the component's DOM element
+   *
+   * @return {Element}
+   * @method createEl
+   */
+  createEl() {
+    let el = super.createEl('div', {
+      className: 'vjs-tooltip-progress-bar vjs-slider-bar',
+      innerHTML: `<div class="vjs-time-tooltip"></div>
+        <span class="vjs-control-text"><span>${this.localize('Progress')}</span>: 0%</span>`
+    });
+
+    this.tooltip = el.querySelector('.vjs-time-tooltip');
+
+    return el;
+  }
+
+  updateDataAttr() {
+    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    let formattedTime = formatTime(time, this.player_.duration());
+    this.el_.setAttribute('data-current-time', formattedTime);
+    this.tooltip.innerHTML = formattedTime;
+  }
+
+}
+
+Component.registerComponent('TooltipProgressBar', TooltipProgressBar);
+export default TooltipProgressBar;
diff --git a/src/js/control-bar/text-track-controls/chapters-button.js b/src/js/control-bar/text-track-controls/chapters-button.js
index 4ec5ecd39f..a885c751e1 100644
--- a/src/js/control-bar/text-track-controls/chapters-button.js
+++ b/src/js/control-bar/text-track-controls/chapters-button.js
@@ -90,11 +90,13 @@ class ChaptersButton extends TextTrackButton {
     let menu = this.menu;
     if (menu === undefined) {
       menu = new Menu(this.player_);
-      menu.contentEl().appendChild(Dom.createEl('li', {
+      let title = Dom.createEl('li', {
         className: 'vjs-menu-title',
         innerHTML: toTitleCase(this.kind_),
         tabIndex: -1
-      }));
+      });
+      menu.children_.unshift(title);
+      Dom.insertElFirst(title, menu.contentEl());
     }
 
     if (chaptersTrack && chaptersTrack.cues == null) {
diff --git a/src/js/control-bar/text-track-controls/descriptions-button.js b/src/js/control-bar/text-track-controls/descriptions-button.js
new file mode 100644
index 0000000000..671c620c56
--- /dev/null
+++ b/src/js/control-bar/text-track-controls/descriptions-button.js
@@ -0,0 +1,77 @@
+/**
+ * @file descriptions-button.js
+ */
+import TextTrackButton from './text-track-button.js';
+import Component from '../../component.js';
+import * as Fn from '../../utils/fn.js';
+
+/**
+ * The button component for toggling and selecting descriptions
+ *
+ * @param {Object} player  Player object
+ * @param {Object=} options Object of option names and values
+ * @param {Function=} ready    Ready callback function
+ * @extends TextTrackButton
+ * @class DescriptionsButton
+ */
+class DescriptionsButton extends TextTrackButton {
+
+  constructor(player, options, ready){
+    super(player, options, ready);
+    this.el_.setAttribute('aria-label', 'Descriptions Menu');
+
+    let tracks = player.textTracks();
+
+    if (tracks) {
+      let changeHandler = Fn.bind(this, this.handleTracksChange);
+
+      tracks.addEventListener('change', changeHandler);
+      this.on('dispose', function() {
+        tracks.removeEventListener('change', changeHandler);
+      });
+    }
+  }
+
+  /**
+   * Handle text track change
+   *
+   * @method handleTracksChange
+   */
+  handleTracksChange(event){
+    let tracks = this.player().textTracks();
+    let disabled = false;
+
+    // Check whether a track of a different kind is showing
+    for (let i = 0, l = tracks.length; i < l; i++) {
+      let track = tracks[i];
+      if (track['kind'] !== this.kind_ && track['mode'] === 'showing') {
+        disabled = true;
+        break;
+      }
+    }
+
+    // If another track is showing, disable this menu button
+    if (disabled) {
+      this.disable();
+    } else {
+      this.enable();
+    }
+  }
+
+  /**
+   * Allow sub components to stack CSS class names
+   *
+   * @return {String} The constructed class name
+   * @method buildCSSClass
+   */
+  buildCSSClass() {
+    return `vjs-descriptions-button ${super.buildCSSClass()}`;
+  }
+
+}
+
+DescriptionsButton.prototype.kind_ = 'descriptions';
+DescriptionsButton.prototype.controlText_ = 'Descriptions';
+
+Component.registerComponent('DescriptionsButton', DescriptionsButton);
+export default DescriptionsButton;
diff --git a/src/js/control-bar/time-controls/current-time-display.js b/src/js/control-bar/time-controls/current-time-display.js
index 91e7694265..ff99fc54e6 100644
--- a/src/js/control-bar/time-controls/current-time-display.js
+++ b/src/js/control-bar/time-controls/current-time-display.js
@@ -55,7 +55,10 @@ class CurrentTimeDisplay extends Component {
     let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
     let localizedText = this.localize('Current Time');
     let formattedTime = formatTime(time, this.player_.duration());
-    this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`;
+    if (formattedTime !== this.formattedTime_) {
+      this.formattedTime_ = formattedTime;
+      this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`;
+    }
   }
 
 }
diff --git a/src/js/control-bar/time-controls/duration-display.js b/src/js/control-bar/time-controls/duration-display.js
index 0e14bb87c9..4350c2e1e1 100644
--- a/src/js/control-bar/time-controls/duration-display.js
+++ b/src/js/control-bar/time-controls/duration-display.js
@@ -58,7 +58,8 @@ class DurationDisplay extends Component {
    */
   updateContent() {
     let duration = this.player_.duration();
-    if (duration) {
+    if (duration && this.duration_ !== duration) {
+      this.duration_ = duration;
       let localizedText = this.localize('Duration Time');
       let formattedTime = formatTime(duration);
       this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`; // label the duration time for screen reader users
diff --git a/src/js/control-bar/time-controls/remaining-time-display.js b/src/js/control-bar/time-controls/remaining-time-display.js
index 8e5ca35b7f..13ed25a1f4 100644
--- a/src/js/control-bar/time-controls/remaining-time-display.js
+++ b/src/js/control-bar/time-controls/remaining-time-display.js
@@ -54,7 +54,10 @@ class RemainingTimeDisplay extends Component {
     if (this.player_.duration()) {
       const localizedText = this.localize('Remaining Time');
       const formattedTime = formatTime(this.player_.remainingTime());
-      this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> -${formattedTime}`;
+      if (formattedTime !== this.formattedTime_) {
+        this.formattedTime_ = formattedTime;
+        this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> -${formattedTime}`;
+      }
     }
 
     // Allows for smooth scrubbing, when player can't keep up.
diff --git a/src/js/control-bar/volume-menu-button.js b/src/js/control-bar/volume-menu-button.js
index f0166e2fff..83879ab5f9 100644
--- a/src/js/control-bar/volume-menu-button.js
+++ b/src/js/control-bar/volume-menu-button.js
@@ -7,7 +7,6 @@ import Popup from '../popup/popup.js';
 import PopupButton from '../popup/popup-button.js';
 import MuteToggle from './mute-toggle.js';
 import VolumeBar from './volume-control/volume-bar.js';
-import document from 'global/document';
 
 /**
  * Button for volume popup
@@ -108,6 +107,7 @@ class VolumeMenuButton extends PopupButton {
 
     popup.addChild(vb);
 
+    this.menuContent = popup;
     this.volumeBar = vb;
 
     this.attachVolumeBarEvents();
@@ -126,12 +126,12 @@ class VolumeMenuButton extends PopupButton {
   }
 
   attachVolumeBarEvents() {
-    this.on(['mousedown', 'touchdown'], this.handleMouseDown);
+    this.menuContent.on(['mousedown', 'touchdown'], Fn.bind(this, this.handleMouseDown));
   }
 
   handleMouseDown(event) {
     this.on(['mousemove', 'touchmove'], Fn.bind(this.volumeBar, this.volumeBar.handleMouseMove));
-    this.on(document, ['mouseup', 'touchend'], this.handleMouseUp);
+    this.on(this.el_.ownerDocument, ['mouseup', 'touchend'], this.handleMouseUp);
   }
 
   handleMouseUp(event) {
diff --git a/src/js/loading-spinner.js b/src/js/loading-spinner.js
index 649e4cd482..d170049eb2 100644
--- a/src/js/loading-spinner.js
+++ b/src/js/loading-spinner.js
@@ -20,7 +20,8 @@ class LoadingSpinner extends Component {
    */
   createEl() {
     return super.createEl('div', {
-      className: 'vjs-loading-spinner'
+      className: 'vjs-loading-spinner',
+      dir: 'ltr'
     });
   }
 }
diff --git a/src/js/menu/menu-button.js b/src/js/menu/menu-button.js
index faa4a27a7e..11d8f575c8 100644
--- a/src/js/menu/menu-button.js
+++ b/src/js/menu/menu-button.js
@@ -23,7 +23,9 @@ class MenuButton extends ClickableComponent {
 
     this.update();
 
-    this.el_.setAttribute('aria-haspopup', true);
+    this.enabled_ = true;
+
+    this.el_.setAttribute('aria-haspopup', 'true');
     this.el_.setAttribute('role', 'menuitem');
     this.on('keydown', this.handleSubmenuKeyPress);
   }
@@ -50,7 +52,7 @@ class MenuButton extends ClickableComponent {
      * @private
      */
     this.buttonPressed_ = false;
-    this.el_.setAttribute('aria-expanded', false);
+    this.el_.setAttribute('aria-expanded', 'false');
 
     if (this.items && this.items.length === 0) {
       this.hide();
@@ -70,11 +72,13 @@ class MenuButton extends ClickableComponent {
 
     // Add a title list item to the top
     if (this.options_.title) {
-      menu.contentEl().appendChild(Dom.createEl('li', {
+      let title = Dom.createEl('li', {
         className: 'vjs-menu-title',
         innerHTML: toTitleCase(this.options_.title),
         tabIndex: -1
-      }));
+      });
+      menu.children_.unshift(title);
+      Dom.insertElFirst(title, menu.contentEl());
     }
 
     this.items = this['createItems']();
@@ -202,10 +206,12 @@ class MenuButton extends ClickableComponent {
    * @method pressButton
    */
   pressButton() {
-    this.buttonPressed_ = true;
-    this.menu.lockShowing();
-    this.el_.setAttribute('aria-expanded', true);
-    this.menu.focus(); // set the focus into the submenu
+    if (this.enabled_) {
+      this.buttonPressed_ = true;
+      this.menu.lockShowing();
+      this.el_.setAttribute('aria-expanded', 'true');
+      this.menu.focus(); // set the focus into the submenu
+    }
   }
 
   /**
@@ -214,10 +220,41 @@ class MenuButton extends ClickableComponent {
    * @method unpressButton
    */
   unpressButton() {
+    if (this.enabled_) {
+      this.buttonPressed_ = false;
+      this.menu.unlockShowing();
+      this.el_.setAttribute('aria-expanded', 'false');
+      this.el_.focus(); // Set focus back to this menu button
+    }
+  }
+
+  /**
+   * Disable the menu button
+   *
+   * @return {Component}
+   * @method disable
+   */
+  disable() {
+    // Unpress, but don't force focus on this button
     this.buttonPressed_ = false;
     this.menu.unlockShowing();
-    this.el_.setAttribute('aria-expanded', false);
-    this.el_.focus(); // Set focus back to this menu button
+    this.el_.setAttribute('aria-expanded', 'false');
+
+    this.enabled_ = false;
+
+    return super.disable();
+  }
+
+  /**
+   * Enable the menu button
+   *
+   * @return {Component}
+   * @method disable
+   */
+  enable() {
+    this.enabled_ = true;
+
+    return super.enable();
   }
 }
 
diff --git a/src/js/menu/menu-item.js b/src/js/menu/menu-item.js
index 555abe0a03..0dd20e642d 100644
--- a/src/js/menu/menu-item.js
+++ b/src/js/menu/menu-item.js
@@ -66,13 +66,13 @@ class MenuItem extends ClickableComponent {
     if (this.selectable) {
       if (selected) {
         this.addClass('vjs-selected');
-        this.el_.setAttribute('aria-checked',true);
+        this.el_.setAttribute('aria-checked','true');
         // aria-checked isn't fully supported by browsers/screen readers,
         // so indicate selected state to screen reader in the control text.
         this.controlText(', selected');
       } else {
         this.removeClass('vjs-selected');
-        this.el_.setAttribute('aria-checked',false);
+        this.el_.setAttribute('aria-checked','false');
         // Indicate un-selected state to screen reader
         // Note that a space clears out the selected state text
         this.controlText(' ');
diff --git a/src/js/menu/menu.js b/src/js/menu/menu.js
index 1fa9923a2f..688e44a11a 100644
--- a/src/js/menu/menu.js
+++ b/src/js/menu/menu.js
@@ -117,7 +117,13 @@ class Menu extends Component {
    * @method focus
    */
   focus (item = 0) {
-    let children = this.children();
+    let children = this.children().slice();
+    let haveTitle = children.length && children[0].className &&
+      /vjs-menu-title/.test(children[0].className);
+
+    if (haveTitle) {
+      children.shift();
+    }
 
     if (children.length > 0) {
       if (item < 0) {
diff --git a/src/js/modal-dialog.js b/src/js/modal-dialog.js
index 833b1e329e..cd9ab6c921 100644
--- a/src/js/modal-dialog.js
+++ b/src/js/modal-dialog.js
@@ -1,8 +1,6 @@
 /**
  * @file modal-dialog.js
  */
-import document from 'global/document';
-
 import * as Dom from './utils/dom';
 import * as Fn from './utils/fn';
 import log from './utils/log';
@@ -175,7 +173,7 @@ class ModalDialog extends Component {
       }
 
       if (this.closeable()) {
-        this.on(document, 'keydown', Fn.bind(this, this.handleKeyPress));
+        this.on(this.el_.ownerDocument, 'keydown', Fn.bind(this, this.handleKeyPress));
       }
 
       player.controls(false);
@@ -221,7 +219,7 @@ class ModalDialog extends Component {
       }
 
       if (this.closeable()) {
-        this.off(document, 'keydown', Fn.bind(this, this.handleKeyPress));
+        this.off(this.el_.ownerDocument, 'keydown', Fn.bind(this, this.handleKeyPress));
       }
 
       player.controls(true);
diff --git a/src/js/player.js b/src/js/player.js
index e94a7ddf3f..b7741a54b0 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -182,6 +182,14 @@ class Player extends Component {
       this.addClass('vjs-controls-disabled');
     }
 
+    // Set ARIA label and region role depending on player type
+    this.el_.setAttribute('role', 'region');
+    if (this.isAudio()) {
+      this.el_.setAttribute('aria-label', 'audio player');
+    } else {
+      this.el_.setAttribute('aria-label', 'video player');
+    }
+
     if (this.isAudio()) {
       this.addClass('vjs-audio');
     }
@@ -196,6 +204,11 @@ class Player extends Component {
     //   this.addClass('vjs-touch-enabled');
     // }
 
+    // iOS Safari has broken hover handling
+    if (!browser.IS_IOS) {
+      this.addClass('vjs-workinghover');
+    }
+
     // Make player easily findable by ID
     Player.players[this.id_] = this;
 
@@ -281,10 +294,12 @@ class Player extends Component {
     // Add a style element in the player that we'll use to set the width/height
     // of the player in a way that's still overrideable by CSS, just like the
     // video element
-    this.styleEl_ = stylesheet.createStyleElement('vjs-styles-dimensions');
-    let defaultsStyleEl = Dom.$('.vjs-styles-defaults');
-    let head = Dom.$('head');
-    head.insertBefore(this.styleEl_, defaultsStyleEl ? defaultsStyleEl.nextSibling : head.firstChild);
+    if (window.VIDEOJS_NO_DYNAMIC_STYLE !== true) {
+      this.styleEl_ = stylesheet.createStyleElement('vjs-styles-dimensions');
+      let defaultsStyleEl = Dom.$('.vjs-styles-defaults');
+      let head = Dom.$('head');
+      head.insertBefore(this.styleEl_, defaultsStyleEl ? defaultsStyleEl.nextSibling : head.firstChild);
+    }
 
     // Pass in the width/height/aspectRatio options which will update the style el
     this.width(this.options_.width);
@@ -292,6 +307,14 @@ class Player extends Component {
     this.fluid(this.options_.fluid);
     this.aspectRatio(this.options_.aspectRatio);
 
+    // Hide any links within the video/audio tag, because IE doesn't hide them completely.
+    let links = tag.getElementsByTagName('a');
+    for (let i = 0; i < links.length; i++) {
+      let linkEl = links.item(i);
+      Dom.addElClass(linkEl, 'vjs-hidden');
+      linkEl.setAttribute('hidden', 'hidden');
+    }
+
     // insertElFirst seems to cause the networkState to flicker from 3 to 2, so
     // keep track of the original for later so we can know if the source originally failed
     tag.initNetworkState_ = tag.networkState;
@@ -300,7 +323,12 @@ class Player extends Component {
     if (tag.parentNode) {
       tag.parentNode.insertBefore(el, tag);
     }
+
+    // insert the tag as the first child of the player element
+    // then manually add it to the children array so that this.addChild
+    // will work properly for other components
     Dom.insertElFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup.
+    this.children_.unshift(tag);
 
     this.el_ = el;
 
@@ -413,6 +441,23 @@ class Player extends Component {
    * @method updateStyleEl_
    */
   updateStyleEl_() {
+    if (window.VIDEOJS_NO_DYNAMIC_STYLE === true) {
+      const width = typeof this.width_ === 'number' ? this.width_ : this.options_.width;
+      const height = typeof this.height_ === 'number' ? this.height_ : this.options_.height;
+      let techEl = this.tech_ && this.tech_.el();
+
+      if (techEl) {
+        if (width >= 0) {
+          techEl.width = width;
+        }
+        if (height >= 0) {
+          techEl.height = height;
+        }
+      }
+
+      return;
+    }
+
     let width;
     let height;
     let aspectRatio;
@@ -807,6 +852,7 @@ class Player extends Component {
   handleTechWaiting_() {
     this.addClass('vjs-waiting');
     this.trigger('waiting');
+    this.one('timeupdate', () => this.removeClass('vjs-waiting'));
   }
 
   /**
@@ -2462,13 +2508,13 @@ class Player extends Component {
     return this.techGet_('readyState');
   }
 
-  /*
-    * Text tracks are tracks of timed text events.
-    * Captions - text displayed over the video for the hearing impaired
-    * Subtitles - text displayed over the video for those who don't understand language in the video
-    * Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
-    * Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device
-    */
+  /**
+   * Text tracks are tracks of timed text events.
+   * Captions - text displayed over the video for the hearing impaired
+   * Subtitles - text displayed over the video for those who don't understand language in the video
+   * Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
+   * Descriptions - audio descriptions that are read back to the user by a screen reading device
+   */
 
   /**
    * Get an array of associated text tracks. captions, subtitles, chapters, descriptions
@@ -2533,7 +2579,9 @@ class Player extends Component {
    * @param {Object} track    Remote text track to remove
    * @method removeRemoteTextTrack
    */
-  removeRemoteTextTrack(track) {
+  // destructure the input into an object with a track argument, defaulting to arguments[0]
+  // default the whole argument to an empty object if nothing was passed in
+  removeRemoteTextTrack({track = arguments[0]} = {}) { // jshint ignore:line
     this.tech_ && this.tech_['removeRemoteTextTrack'](track);
   }
 
@@ -2758,7 +2806,7 @@ Player.prototype.options_ = {
   languages: {},
 
   // Default message to show when a video cannot be played.
-  notSupportedMessage: 'No compatible source was found for this video.'
+  notSupportedMessage: 'No compatible source was found for this media.'
 };
 
 /**
diff --git a/src/js/setup.js b/src/js/setup.js
index 5e5b9277ec..4659624aa2 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -72,7 +72,10 @@ var autoSetup = function(){
 
 // Pause to let the DOM keep processing
 var autoSetupTimeout = function(wait, vjs){
-  videojs = vjs;
+  if (vjs) {
+    videojs = vjs;
+  }
+
   setTimeout(autoSetup, wait);
 };
 
diff --git a/src/js/slider/slider.js b/src/js/slider/slider.js
index ae182b4c05..9bcd77ac8c 100644
--- a/src/js/slider/slider.js
+++ b/src/js/slider/slider.js
@@ -3,7 +3,6 @@
  */
 import Component from '../component.js';
 import * as Dom from '../utils/dom.js';
-import document from 'global/document';
 import assign from 'object.assign';
 
 /**
@@ -68,16 +67,18 @@ class Slider extends Component {
    * @method handleMouseDown
    */
   handleMouseDown(event) {
+    let doc = this.bar.el_.ownerDocument;
+
     event.preventDefault();
     Dom.blockTextSelection();
 
     this.addClass('vjs-sliding');
     this.trigger('slideractive');
 
-    this.on(document, 'mousemove', this.handleMouseMove);
-    this.on(document, 'mouseup', this.handleMouseUp);
-    this.on(document, 'touchmove', this.handleMouseMove);
-    this.on(document, 'touchend', this.handleMouseUp);
+    this.on(doc, 'mousemove', this.handleMouseMove);
+    this.on(doc, 'mouseup', this.handleMouseUp);
+    this.on(doc, 'touchmove', this.handleMouseMove);
+    this.on(doc, 'touchend', this.handleMouseUp);
 
     this.handleMouseMove(event);
   }
@@ -95,15 +96,17 @@ class Slider extends Component {
    * @method handleMouseUp
    */
   handleMouseUp() {
+    let doc = this.bar.el_.ownerDocument;
+
     Dom.unblockTextSelection();
 
     this.removeClass('vjs-sliding');
     this.trigger('sliderinactive');
 
-    this.off(document, 'mousemove', this.handleMouseMove);
-    this.off(document, 'mouseup', this.handleMouseUp);
-    this.off(document, 'touchmove', this.handleMouseMove);
-    this.off(document, 'touchend', this.handleMouseUp);
+    this.off(doc, 'mousemove', this.handleMouseMove);
+    this.off(doc, 'mouseup', this.handleMouseUp);
+    this.off(doc, 'touchmove', this.handleMouseMove);
+    this.off(doc, 'touchend', this.handleMouseUp);
 
     this.update();
   }
@@ -166,7 +169,7 @@ class Slider extends Component {
    * @method handleFocus
    */
   handleFocus() {
-    this.on(document, 'keydown', this.handleKeyPress);
+    this.on(this.bar.el_.ownerDocument, 'keydown', this.handleKeyPress);
   }
 
   /**
@@ -191,7 +194,7 @@ class Slider extends Component {
    * @method handleBlur
    */
   handleBlur() {
-    this.off(document, 'keydown', this.handleKeyPress);
+    this.off(this.bar.el_.ownerDocument, 'keydown', this.handleKeyPress);
   }
 
   /**
diff --git a/src/js/tech/html5.js b/src/js/tech/html5.js
index 355a68359f..2993d8b452 100644
--- a/src/js/tech/html5.js
+++ b/src/js/tech/html5.js
@@ -257,10 +257,18 @@ class Html5 extends Tech {
   proxyNativeTextTracks_() {
     let tt = this.el().textTracks;
 
-    if (tt && tt.addEventListener) {
-      tt.addEventListener('change', this.handleTextTrackChange_);
-      tt.addEventListener('addtrack', this.handleTextTrackAdd_);
-      tt.addEventListener('removetrack', this.handleTextTrackRemove_);
+    if (tt) {
+      // Add tracks - if player is initialised after DOM loaded, textTracks
+      // will not trigger addtrack
+      for (let i = 0; i < tt.length; i++) {
+        this.textTracks().addTrack_(tt[i]);
+      }
+
+      if (tt.addEventListener) {
+        tt.addEventListener('change', this.handleTextTrackChange_);
+        tt.addEventListener('addtrack', this.handleTextTrackAdd_);
+        tt.addEventListener('removetrack', this.handleTextTrackRemove_);
+      }
     }
   }
 
@@ -504,7 +512,7 @@ class Html5 extends Tech {
    * @return {Object}
    * @method currentSrc
    */
-  currentSrc() { 
+  currentSrc() {
     if (this.currentSource_) {
       return this.currentSource_.src;
     } else {
@@ -927,9 +935,14 @@ Html5.canControlVolume = function(){
 /*
  * Check if playbackRate is supported in this browser/device.
  *
- * @return {Number} [description]
+ * @return {Boolean}
  */
 Html5.canControlPlaybackRate = function(){
+  // Playback rate API is implemented in Android Chrome, but doesn't do anything
+  // https://github.com/videojs/video.js/issues/3180
+  if (browser.IS_ANDROID && browser.IS_CHROME) {
+    return false;
+  }
   var playbackRate = Html5.TEST_VID.playbackRate;
   Html5.TEST_VID.playbackRate = (playbackRate / 2) + 0.1;
   return playbackRate !== Html5.TEST_VID.playbackRate;
diff --git a/src/js/tech/tech.js b/src/js/tech/tech.js
index 5af128535d..3f9a509a64 100644
--- a/src/js/tech/tech.js
+++ b/src/js/tech/tech.js
@@ -327,6 +327,16 @@ class Tech extends Component {
     if (!window['WebVTT'] && this.el().parentNode != null) {
       let script = document.createElement('script');
       script.src = this.options_['vtt.js'] || '../node_modules/videojs-vtt.js/dist/vtt.js';
+      script.onload = () => {
+        this.trigger('vttjsloaded');
+      };
+      script.onerror = () => {
+        this.trigger('vttjserror');
+      };
+      this.on('dispose', () => {
+        script.onload = null;
+        script.onerror = null;
+      });
       this.el().parentNode.appendChild(script);
       window['WebVTT'] = true;
     }
diff --git a/src/js/tracks/text-track-cue-list.js b/src/js/tracks/text-track-cue-list.js
index 81729369d8..3abd7ed069 100644
--- a/src/js/tracks/text-track-cue-list.js
+++ b/src/js/tracks/text-track-cue-list.js
@@ -4,7 +4,8 @@
 import * as browser from '../utils/browser.js';
 import document from 'global/document';
 
-/*
+/**
+ * A List of text track cues as defined in:
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackcuelist
  *
  * interface TextTrackCueList {
@@ -12,72 +13,93 @@ import document from 'global/document';
  *   getter TextTrackCue (unsigned long index);
  *   TextTrackCue? getCueById(DOMString id);
  * };
+ *
+ * @param {Array} cues A list of cues to be initialized with
+ * @class TextTrackCueList
  */
 
-let TextTrackCueList = function(cues) {
-  let list = this;
+class TextTrackCueList {
+  constructor(cues) {
+    let list = this;
 
-  if (browser.IS_IE8) {
-    list = document.createElement('custom');
+    if (browser.IS_IE8) {
+      list = document.createElement('custom');
 
-    for (let prop in TextTrackCueList.prototype) {
-      if (prop !== 'constructor') {
-        list[prop] = TextTrackCueList.prototype[prop];
+      for (let prop in TextTrackCueList.prototype) {
+        if (prop !== 'constructor') {
+          list[prop] = TextTrackCueList.prototype[prop];
+        }
       }
     }
-  }
 
-  TextTrackCueList.prototype.setCues_.call(list, cues);
+    TextTrackCueList.prototype.setCues_.call(list, cues);
 
-  Object.defineProperty(list, 'length', {
-    get: function() {
-      return this.length_;
-    }
-  });
+    Object.defineProperty(list, 'length', {
+      get() {
+        return this.length_;
+      }
+    });
 
-  if (browser.IS_IE8) {
-    return list;
+    if (browser.IS_IE8) {
+      return list;
+    }
   }
-};
 
-TextTrackCueList.prototype.setCues_ = function(cues) {
-  let oldLength = this.length || 0;
-  let i = 0;
-  let l = cues.length;
+  /**
+   * A setter for cues in this list
+   *
+   * @param {Array} cues an array of cues
+   * @method setCues_
+   * @private
+   */
+  setCues_(cues) {
+    let oldLength = this.length || 0;
+    let i = 0;
+    let l = cues.length;
 
-  this.cues_ = cues;
-  this.length_ = cues.length;
+    this.cues_ = cues;
+    this.length_ = cues.length;
 
-  let defineProp = function(i) {
-    if (!(''+i in this)) {
-      Object.defineProperty(this, '' + i, {
-        get: function() {
-          return this.cues_[i];
-        }
-      });
-    }
-  };
+    let defineProp = function(index) {
+      if (!('' + index in this)) {
+        Object.defineProperty(this, '' + index, {
+          get() {
+            return this.cues_[index];
+          }
+        });
+      }
+    };
 
-  if (oldLength < l) {
-    i = oldLength;
+    if (oldLength < l) {
+      i = oldLength;
 
-    for(; i < l; i++) {
-      defineProp.call(this, i);
+      for (; i < l; i++) {
+        defineProp.call(this, i);
+      }
     }
   }
-};
-
-TextTrackCueList.prototype.getCueById = function(id) {
-  let result = null;
-  for (let i = 0, l = this.length; i < l; i++) {
-    let cue = this[i];
-    if (cue.id === id) {
-      result = cue;
-      break;
+
+  /**
+   * Get a cue that is currently in the Cue list by id
+   *
+   * @param {String} id
+   * @method getCueById
+   * @return {Object} a single cue
+   */
+  getCueById(id) {
+    let result = null;
+
+    for (let i = 0, l = this.length; i < l; i++) {
+      let cue = this[i];
+
+      if (cue.id === id) {
+        result = cue;
+        break;
+      }
     }
-  }
 
-  return result;
-};
+    return result;
+  }
+}
 
 export default TextTrackCueList;
diff --git a/src/js/tracks/text-track-display.js b/src/js/tracks/text-track-display.js
index e159b28357..40ca875b37 100644
--- a/src/js/tracks/text-track-display.js
+++ b/src/js/tracks/text-track-display.js
@@ -58,6 +58,34 @@ class TextTrackDisplay extends Component {
         let track = tracks[i];
         this.player_.addRemoteTextTrack(track);
       }
+
+      let modes = {'captions': 1, 'subtitles': 1};
+      let trackList = this.player_.textTracks();
+      let firstDesc;
+      let firstCaptions;
+
+      if (trackList) {
+        for (let i = 0; i < trackList.length; i++) {
+          let track = trackList[i];
+          if (track.default) {
+            if (track.kind === 'descriptions' && !firstDesc) {
+              firstDesc = track;
+            } else if (track.kind in modes && !firstCaptions) {
+              firstCaptions = track;
+            }
+          }
+        }
+
+        // We want to show the first default track but captions and subtitles
+        // take precedence over descriptions.
+        // So, display the first default captions or subtitles track
+        // and otherwise the first default descriptions track.
+        if (firstCaptions) {
+          firstCaptions.mode = 'showing';
+        } else if (firstDesc) {
+          firstDesc.mode = 'showing';
+        }
+      }
     }));
   }
 
@@ -83,6 +111,9 @@ class TextTrackDisplay extends Component {
   createEl() {
     return super.createEl('div', {
       className: 'vjs-text-track-display'
+    }, {
+      'aria-live': 'assertive',
+      'aria-atomic': 'true'
     });
   }
 
@@ -111,12 +142,30 @@ class TextTrackDisplay extends Component {
       return;
     }
 
-    for (let i=0; i < tracks.length; i++) {
+    // Track display prioritization model: if multiple tracks are 'showing',
+    //  display the first 'subtitles' or 'captions' track which is 'showing',
+    //  otherwise display the first 'descriptions' track which is 'showing'
+
+    let descriptionsTrack = null;
+    let captionsSubtitlesTrack = null;
+
+    let i = tracks.length;
+    while (i--) {
       let track = tracks[i];
       if (track['mode'] === 'showing') {
-        this.updateForTrack(track);
+        if (track['kind'] === 'descriptions') {
+          descriptionsTrack = track;
+        } else {
+          captionsSubtitlesTrack = track;
+        }
       }
     }
+
+    if (captionsSubtitlesTrack) {
+      this.updateForTrack(captionsSubtitlesTrack);
+    } else if (descriptionsTrack) {
+      this.updateForTrack(descriptionsTrack);
+    }
   }
 
   /**
@@ -137,7 +186,7 @@ class TextTrackDisplay extends Component {
       cues.push(track['activeCues'][i]);
     }
 
-    window['WebVTT']['processCues'](window, track['activeCues'], this.el_);
+    window['WebVTT']['processCues'](window, cues, this.el_);
 
     let i = cues.length;
     while (i--) {
diff --git a/src/js/tracks/text-track-enums.js b/src/js/tracks/text-track-enums.js
index 738fbf4cbd..40c34f77b3 100644
--- a/src/js/tracks/text-track-enums.js
+++ b/src/js/tracks/text-track-enums.js
@@ -1,27 +1,39 @@
 /**
  * @file text-track-enums.js
- *
+ */
+
+/**
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackmode
  *
  * enum TextTrackMode { "disabled",  "hidden",  "showing" };
  */
-var TextTrackMode = {
-  'disabled': 'disabled',
-  'hidden': 'hidden',
-  'showing': 'showing'
+const TextTrackMode = {
+  disabled: 'disabled',
+  hidden: 'hidden',
+  showing: 'showing'
 };
 
-/*
+/**
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackkind
  *
- * enum TextTrackKind { "subtitles",  "captions",  "descriptions",  "chapters",  "metadata" };
+ * enum TextTrackKind {
+ *   "subtitles",
+ *   "captions",
+ *   "descriptions",
+ *   "chapters",
+ *   "metadata"
+ * };
  */
-var TextTrackKind = {
-  'subtitles': 'subtitles',
-  'captions': 'captions',
-  'descriptions': 'descriptions',
-  'chapters': 'chapters',
-  'metadata': 'metadata'
+const TextTrackKind = {
+  subtitles: 'subtitles',
+  captions: 'captions',
+  descriptions: 'descriptions',
+  chapters: 'chapters',
+  metadata: 'metadata'
 };
 
+/* jshint ignore:start */
+// we ignore jshint here because it does not see
+// TextTrackMode or TextTrackKind as defined here somehow...
 export { TextTrackMode, TextTrackKind };
+/* jshint ignore:end */
diff --git a/src/js/tracks/text-track-list.js b/src/js/tracks/text-track-list.js
index 6022213643..83c3294f32 100644
--- a/src/js/tracks/text-track-list.js
+++ b/src/js/tracks/text-track-list.js
@@ -6,7 +6,8 @@ import * as Fn from '../utils/fn.js';
 import * as browser from '../utils/browser.js';
 import document from 'global/document';
 
-/*
+/**
+ * A text track list as defined in:
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttracklist
  *
  * interface TextTrackList : EventTarget {
@@ -18,50 +19,144 @@ import document from 'global/document';
  *   attribute EventHandler onaddtrack;
  *   attribute EventHandler onremovetrack;
  * };
+ *
+ * @param {Track[]} tracks A list of tracks to initialize the list with
+ * @extends EventTarget
+ * @class TextTrackList
  */
-let TextTrackList = function(tracks) {
-  let list = this;
 
-  if (browser.IS_IE8) {
-    list = document.createElement('custom');
+class TextTrackList extends EventTarget {
+  constructor(tracks = []) {
+    super();
+    let list = this;
+
+    if (browser.IS_IE8) {
+      list = document.createElement('custom');
+
+      for (let prop in TextTrackList.prototype) {
+        if (prop !== 'constructor') {
+          list[prop] = TextTrackList.prototype[prop];
+        }
+      }
+    }
+
+    list.tracks_ = [];
 
-    for (let prop in TextTrackList.prototype) {
-      if (prop !== 'constructor') {
-        list[prop] = TextTrackList.prototype[prop];
+    Object.defineProperty(list, 'length', {
+      get() {
+        return this.tracks_.length;
       }
+    });
+
+    for (let i = 0; i < tracks.length; i++) {
+      list.addTrack_(tracks[i]);
+    }
+
+    if (browser.IS_IE8) {
+      return list;
     }
   }
 
-  tracks = tracks || [];
-  list.tracks_ = [];
+  /**
+   * Add TextTrack from TextTrackList
+   *
+   * @param {TextTrack} track
+   * @method addTrack_
+   * @private
+   */
+  addTrack_(track) {
+    let index = this.tracks_.length;
+
+    if (!('' + index in this)) {
+      Object.defineProperty(this, index, {
+        get() {
+          return this.tracks_[index];
+        }
+      });
+    }
 
-  Object.defineProperty(list, 'length', {
-    get: function() {
-      return this.tracks_.length;
+    track.addEventListener('modechange', Fn.bind(this, function() {
+      this.trigger('change');
+    }));
+
+    // Do not add duplicate tracks
+    if (this.tracks_.indexOf(track) === -1) {
+      this.tracks_.push(track);
+      this.trigger({
+        track,
+        type: 'addtrack'
+      });
     }
-  });
 
-  for (let i = 0; i < tracks.length; i++) {
-    list.addTrack_(tracks[i]);
   }
 
-  if (browser.IS_IE8) {
-    return list;
+  /**
+   * Remove TextTrack from TextTrackList
+   * NOTE: Be mindful of what is passed in as it may be a HTMLTrackElement
+   *
+   * @param {TextTrack} rtrack
+   * @method removeTrack_
+   * @private
+   */
+  removeTrack_(rtrack) {
+    let track;
+
+    for (let i = 0, l = this.length; i < l; i++) {
+      if (this[i] === rtrack) {
+        track = this[i];
+        if (track.off) {
+          track.off();
+        }
+
+        this.tracks_.splice(i, 1);
+
+        break;
+      }
+    }
+
+    if (!track) {
+      return;
+    }
+
+    this.trigger({
+      track,
+      type: 'removetrack'
+    });
   }
-};
 
-TextTrackList.prototype = Object.create(EventTarget.prototype);
-TextTrackList.prototype.constructor = TextTrackList;
+  /**
+   * Get a TextTrack from TextTrackList by a tracks id
+   *
+   * @param {String} id - the id of the track to get
+   * @method getTrackById
+   * @return {TextTrack}
+   * @private
+   */
+  getTrackById(id) {
+    let result = null;
+
+    for (let i = 0, l = this.length; i < l; i++) {
+      let track = this[i];
+
+      if (track.id === id) {
+        result = track;
+        break;
+      }
+    }
 
-/*
+    return result;
+  }
+}
+
+/**
  * change - One or more tracks in the track list have been enabled or disabled.
  * addtrack - A track has been added to the track list.
  * removetrack - A track has been removed from the track list.
  */
 TextTrackList.prototype.allowedEvents_ = {
-  'change': 'change',
-  'addtrack': 'addtrack',
-  'removetrack': 'removetrack'
+  change: 'change',
+  addtrack: 'addtrack',
+  removetrack: 'removetrack'
 };
 
 // emulate attribute EventHandler support to allow for feature detection
@@ -69,77 +164,4 @@ for (let event in TextTrackList.prototype.allowedEvents_) {
   TextTrackList.prototype['on' + event] = null;
 }
 
-/**
- * Add TextTrack from TextTrackList
- *
- * @param {TextTrack} track
- * @method addTrack_
- * @private
- */
-TextTrackList.prototype.addTrack_ = function(track) {
-  let index = this.tracks_.length;
-  if (!(''+index in this)) {
-    Object.defineProperty(this, index, {
-      get: function() {
-        return this.tracks_[index];
-      }
-    });
-  }
-
-  track.addEventListener('modechange', Fn.bind(this, function() {
-    this.trigger('change');
-  }));
-  this.tracks_.push(track);
-
-  this.trigger({
-    type: 'addtrack',
-    track: track
-  });
-};
-
-/**
- * Remove TextTrack from TextTrackList
- * NOTE: Be mindful of what is passed in as it may be a HTMLTrackElement
- *
- * @param {TextTrack} rtrack
- * @method removeTrack_
- * @private
- */
-TextTrackList.prototype.removeTrack_ = function(rtrack) {
-  let track;
-
-  for (let i = 0, l = this.length; i < l; i++) {
-    if (this[i] === rtrack) {
-      track = this[i];
-
-      this.tracks_.splice(i, 1);
-
-      break;
-    }
-  }
-
-  if (!track) {
-    return;
-  }
-
-  this.trigger({
-    type: 'removetrack',
-    track: track
-  });
-};
-
-TextTrackList.prototype.getTrackById = function(id) {
-  let result = null;
-
-  for (let i = 0, l = this.length; i < l; i++) {
-    let track = this[i];
-    if (track.id === id) {
-      result = track;
-      break;
-    }
-  }
-
-  return result;
-};
-
 export default TextTrackList;
diff --git a/src/js/tracks/text-track-settings.js b/src/js/tracks/text-track-settings.js
index da7b7fc4f5..c0291e5406 100644
--- a/src/js/tracks/text-track-settings.js
+++ b/src/js/tracks/text-track-settings.js
@@ -158,10 +158,16 @@ class TextTrackSettings extends Component {
    * @method restoreSettings
    */
   restoreSettings() {
-    let [err, values] = safeParseTuple(window.localStorage.getItem('vjs-text-track-settings'));
+    let err, values;
 
-    if (err) {
-      log.error(err);
+    try {
+      [err, values] = safeParseTuple(window.localStorage.getItem('vjs-text-track-settings'));
+
+      if (err) {
+        log.error(err);
+      }
+    } catch (e) {
+      log.warn(e);
     }
 
     if (values) {
@@ -186,7 +192,9 @@ class TextTrackSettings extends Component {
       } else {
         window.localStorage.removeItem('vjs-text-track-settings');
       }
-    } catch (e) {}
+    } catch (e) {
+      log.warn(e);
+    }
   }
 
   /**
diff --git a/src/js/tracks/text-track.js b/src/js/tracks/text-track.js
index 5002a191df..9e914522db 100644
--- a/src/js/tracks/text-track.js
+++ b/src/js/tracks/text-track.js
@@ -13,7 +13,92 @@ import window from 'global/window';
 import { isCrossOrigin } from '../utils/url.js';
 import XHR from 'xhr';
 
-/*
+/**
+ * takes a webvtt file contents and parses it into cues
+ *
+ * @param {String} srcContent webVTT file contents
+ * @param {Track} track track to addcues to
+ */
+const parseCues = function(srcContent, track) {
+  let parser = new window.WebVTT.Parser(window,
+                                        window.vttjs,
+                                        window.WebVTT.StringDecoder());
+  let errors = [];
+
+  parser.oncue = function(cue) {
+    track.addCue(cue);
+  };
+
+  parser.onparsingerror = function(error) {
+    errors.push(error);
+  };
+
+  parser.onflush = function() {
+    track.trigger({
+      type: 'loadeddata',
+      target: track
+    });
+  };
+
+  parser.parse(srcContent);
+  if (errors.length > 0) {
+    if (console.groupCollapsed) {
+      console.groupCollapsed(`Text Track parsing errors for ${track.src}`);
+    }
+    errors.forEach((error) => log.error(error));
+    if (console.groupEnd) {
+      console.groupEnd();
+    }
+  }
+
+  parser.flush();
+};
+
+
+/**
+ * load a track from a  specifed url
+ *
+ * @param {String} src url to load track from
+ * @param {Track} track track to addcues to
+ */
+const loadTrack = function(src, track) {
+  let opts = {
+    uri: src
+  };
+  let crossOrigin = isCrossOrigin(src);
+
+  if (crossOrigin) {
+    opts.cors = crossOrigin;
+  }
+
+  XHR(opts, Fn.bind(this, function(err, response, responseBody) {
+    if (err) {
+      return log.error(err, response);
+    }
+
+    track.loaded_ = true;
+
+    // Make sure that vttjs has loaded, otherwise, wait till it finished loading
+    // NOTE: this is only used for the alt/video.novtt.js build
+    if (typeof window.WebVTT !== 'function') {
+      if (track.tech_) {
+        let loadHandler = () => parseCues(responseBody, track);
+        track.tech_.on('vttjsloaded', loadHandler);
+        track.tech_.on('vttjserror', () => {
+          log.error(`vttjs failed to load, stopping trying to process ${track.src}`);
+          track.tech_.off('vttjsloaded', loadHandler);
+        });
+
+      }
+    } else {
+      parseCues(responseBody, track);
+    }
+
+  }));
+};
+
+/**
+ * A single text track as defined in:
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrack
  *
  * interface TextTrack : EventTarget {
@@ -34,288 +119,231 @@ import XHR from 'xhr';
  *
  *   attribute EventHandler oncuechange;
  * };
+ *
+ * @param {Object=} options Object of option names and values
+ * @extends EventTarget
+ * @class TextTrack
  */
-let TextTrack = function(options={}) {
-  if (!options.tech) {
-    throw new Error('A tech was not provided.');
-  }
-
-  let tt = this;
-  if (browser.IS_IE8) {
-    tt = document.createElement('custom');
-
-    for (let prop in TextTrack.prototype) {
-      if (prop !== 'constructor') {
-        tt[prop] = TextTrack.prototype[prop];
-      }
+class TextTrack extends EventTarget {
+  constructor(options = {}) {
+    super();
+    if (!options.tech) {
+      throw new Error('A tech was not provided.');
     }
-  }
 
-  tt.tech_ = options.tech;
+    let tt = this;
 
-  let mode = TextTrackEnum.TextTrackMode[options['mode']] || 'disabled';
-  let kind = TextTrackEnum.TextTrackKind[options['kind']] || 'subtitles';
-  let label = options['label'] || '';
-  let language = options['language'] || options['srclang'] || '';
-  let id = options['id'] || 'vjs_text_track_' + Guid.newGUID();
+    if (browser.IS_IE8) {
+      tt = document.createElement('custom');
 
-  if (kind === 'metadata' || kind === 'chapters') {
-    mode = 'hidden';
-  }
+      for (let prop in TextTrack.prototype) {
+        if (prop !== 'constructor') {
+          tt[prop] = TextTrack.prototype[prop];
+        }
+      }
+    }
 
-  tt.cues_ = [];
-  tt.activeCues_ = [];
+    tt.tech_ = options.tech;
 
-  let cues = new TextTrackCueList(tt.cues_);
-  let activeCues = new TextTrackCueList(tt.activeCues_);
+    let mode = TextTrackEnum.TextTrackMode[options.mode] || 'disabled';
+    let kind = TextTrackEnum.TextTrackKind[options.kind] || 'subtitles';
+    let default_ = options.default;
+    let label = options.label || '';
+    let language = options.language || options.srclang || '';
+    let id = options.id || 'vjs_text_track_' + Guid.newGUID();
 
-  let changed = false;
-  let timeupdateHandler = Fn.bind(tt, function() {
-    this['activeCues'];
-    if (changed) {
-      this['trigger']('cuechange');
-      changed = false;
+    if (kind === 'metadata' || kind === 'chapters') {
+      mode = 'hidden';
     }
-  });
-  if (mode !== 'disabled') {
-    tt.tech_.on('timeupdate', timeupdateHandler);
-  }
 
-  Object.defineProperty(tt, 'kind', {
-    get: function() {
-      return kind;
-    },
-    set: Function.prototype
-  });
-
-  Object.defineProperty(tt, 'label', {
-    get: function() {
-      return label;
-    },
-    set: Function.prototype
-  });
-
-  Object.defineProperty(tt, 'language', {
-    get: function() {
-      return language;
-    },
-    set: Function.prototype
-  });
-
-  Object.defineProperty(tt, 'id', {
-    get: function() {
-      return id;
-    },
-    set: Function.prototype
-  });
-
-  Object.defineProperty(tt, 'mode', {
-    get: function() {
-      return mode;
-    },
-    set: function(newMode) {
-      if (!TextTrackEnum.TextTrackMode[newMode]) {
-        return;
+    tt.cues_ = [];
+    tt.activeCues_ = [];
+
+    let cues = new TextTrackCueList(tt.cues_);
+    let activeCues = new TextTrackCueList(tt.activeCues_);
+    let changed = false;
+    let timeupdateHandler = Fn.bind(tt, function() {
+      this.activeCues;
+      if (changed) {
+        this.trigger('cuechange');
+        changed = false;
       }
-      mode = newMode;
-      if (mode === 'showing') {
-        this.tech_.on('timeupdate', timeupdateHandler);
-      }
-      this.trigger('modechange');
+    });
+
+    if (mode !== 'disabled') {
+      tt.tech_.on('timeupdate', timeupdateHandler);
     }
-  });
 
-  Object.defineProperty(tt, 'cues', {
-    get: function() {
-      if (!this.loaded_) {
-        return null;
-      }
+    Object.defineProperty(tt, 'kind', {
+      get() {
+        return kind;
+      },
+      set() {}
+    });
 
-      return cues;
-    },
-    set: Function.prototype
-  });
+    Object.defineProperty(tt, 'label', {
+      get() {
+        return label;
+      },
+      set() {}
+    });
 
-  Object.defineProperty(tt, 'activeCues', {
-    get: function() {
-      if (!this.loaded_) {
-        return null;
-      }
+    Object.defineProperty(tt, 'language', {
+      get() {
+        return language;
+      },
+      set() {}
+    });
 
-      if (this['cues'].length === 0) {
-        return activeCues; // nothing to do
-      }
+    Object.defineProperty(tt, 'id', {
+      get() {
+        return id;
+      },
+      set() {}
+    });
 
-      let ct = this.tech_.currentTime();
-      let active = [];
+    Object.defineProperty(tt, 'default', {
+      get() {
+        return default_;
+      },
+      set() {}
+    });
 
-      for (let i = 0, l = this['cues'].length; i < l; i++) {
-        let cue = this['cues'][i];
-        if (cue['startTime'] <= ct && cue['endTime'] >= ct) {
-          active.push(cue);
-        } else if (cue['startTime'] === cue['endTime'] && cue['startTime'] <= ct && cue['startTime'] + 0.5 >= ct) {
-          active.push(cue);
+    Object.defineProperty(tt, 'mode', {
+      get() {
+        return mode;
+      },
+      set(newMode) {
+        if (!TextTrackEnum.TextTrackMode[newMode]) {
+          return;
         }
-      }
-
-      changed = false;
-
-      if (active.length !== this.activeCues_.length) {
-        changed = true;
-      } else {
-        for (let i = 0; i < active.length; i++) {
-          if (indexOf.call(this.activeCues_, active[i]) === -1) {
-            changed = true;
-          }
+        mode = newMode;
+        if (mode === 'showing') {
+          this.tech_.on('timeupdate', timeupdateHandler);
         }
+        this.trigger('modechange');
       }
+    });
 
-      this.activeCues_ = active;
-      activeCues.setCues_(this.activeCues_);
-
-      return activeCues;
-    },
-    set: Function.prototype
-  });
-
-  if (options.src) {
-    tt.src = options.src;
-    loadTrack(options.src, tt);
-  } else {
-    tt.loaded_ = true;
-  }
-
-  if (browser.IS_IE8) {
-    return tt;
-  }
-};
-
-TextTrack.prototype = Object.create(EventTarget.prototype);
-TextTrack.prototype.constructor = TextTrack;
+    Object.defineProperty(tt, 'cues', {
+      get() {
+        if (!this.loaded_) {
+          return null;
+        }
 
-/*
- * cuechange - One or more cues in the track have become active or stopped being active.
- */
-TextTrack.prototype.allowedEvents_ = {
-  'cuechange': 'cuechange'
-};
+        return cues;
+      },
+      set() {}
+    });
 
-TextTrack.prototype.addCue = function(cue) {
-  let tracks = this.tech_.textTracks();
+    Object.defineProperty(tt, 'activeCues', {
+      get() {
+        if (!this.loaded_) {
+          return null;
+        }
 
-  if (tracks) {
-    for (let i = 0; i < tracks.length; i++) {
-      if (tracks[i] !== this) {
-        tracks[i].removeCue(cue);
-      }
-    }
-  }
+        // nothing to do
+        if (this.cues.length === 0) {
+          return activeCues;
+        }
 
-  this.cues_.push(cue);
-  this['cues'].setCues_(this.cues_);
-};
+        let ct = this.tech_.currentTime();
+        let active = [];
 
-TextTrack.prototype.removeCue = function(removeCue) {
-  let removed = false;
+        for (let i = 0, l = this.cues.length; i < l; i++) {
+          let cue = this.cues[i];
 
-  for (let i = 0, l = this.cues_.length; i < l; i++) {
-    let cue = this.cues_[i];
-    if (cue === removeCue) {
-      this.cues_.splice(i, 1);
-      removed = true;
-    }
-  }
-
-  if (removed) {
-    this.cues.setCues_(this.cues_);
-  }
-};
+          if (cue.startTime <= ct && cue.endTime >= ct) {
+            active.push(cue);
+          } else if (cue.startTime === cue.endTime &&
+                     cue.startTime <= ct &&
+                     cue.startTime + 0.5 >= ct) {
+            active.push(cue);
+          }
+        }
 
-/*
-* Downloading stuff happens below this point
-*/
-var parseCues = function(srcContent, track) {
-  let parser = new window.WebVTT.Parser(window, window.vttjs, window.WebVTT.StringDecoder());
+        changed = false;
 
-  parser.oncue = function(cue) {
-    track.addCue(cue);
-  };
+        if (active.length !== this.activeCues_.length) {
+          changed = true;
+        } else {
+          for (let i = 0; i < active.length; i++) {
+            if (this.activeCues_.indexOf(active[i]) === -1) {
+              changed = true;
+            }
+          }
+        }
 
-  parser.onparsingerror = function(error) {
-    log.error(error);
-  };
+        this.activeCues_ = active;
+        activeCues.setCues_(this.activeCues_);
 
-  parser.onflush = function() {
-    track.trigger({
-      type: 'loadeddata',
-      target: track
+        return activeCues;
+      },
+      set() {}
     });
-  };
-
-  parser.parse(srcContent);
-  parser.flush();
-};
 
-var loadTrack = function(src, track) {
-  let opts = {
-    uri: src
-  };
-
-  let crossOrigin = isCrossOrigin(src);
-  if (crossOrigin) {
-    opts.cors = crossOrigin;
-  }
-
-  XHR(opts, Fn.bind(this, function(err, response, responseBody){
-    if (err) {
-      return log.error(err, response);
-    }
-
-    track.loaded_ = true;
-
-    // NOTE: this is only used for the alt/video.novtt.js build
-    if (typeof window.WebVTT !== 'function') {
-      window.setTimeout(function() {
-        parseCues(responseBody, track);
-      }, 100);
+    if (options.src) {
+      tt.src = options.src;
+      loadTrack(options.src, tt);
     } else {
-      parseCues(responseBody, track);
+      tt.loaded_ = true;
     }
-  }));
-};
-
-var indexOf = function(searchElement, fromIndex) {
-  if (this == null) {
-    throw new TypeError('"this" is null or not defined');
-  }
-
-  let O = Object(this);
 
-  let len = O.length >>> 0;
-
-  if (len === 0) {
-    return -1;
+    if (browser.IS_IE8) {
+      return tt;
+    }
   }
 
-  let n = +fromIndex || 0;
-
-  if (Math.abs(n) === Infinity) {
-    n = 0;
-  }
+  /**
+   * add a cue to the internal list of cues
+   *
+   * @param {Object} cue the cue to add to our internal list
+   * @method addCue
+   */
+  addCue(cue) {
+    let tracks = this.tech_.textTracks();
+
+    if (tracks) {
+      for (let i = 0; i < tracks.length; i++) {
+        if (tracks[i] !== this) {
+          tracks[i].removeCue(cue);
+        }
+      }
+    }
 
-  if (n >= len) {
-    return -1;
+    this.cues_.push(cue);
+    this.cues.setCues_(this.cues_);
   }
 
-  let k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+  /**
+   * remvoe a cue from our internal list
+   *
+   * @param {Object} removeCue the cue to remove from our internal list
+   * @method removeCue
+   */
+  removeCue(removeCue) {
+    let removed = false;
+
+    for (let i = 0, l = this.cues_.length; i < l; i++) {
+      let cue = this.cues_[i];
+
+      if (cue === removeCue) {
+        this.cues_.splice(i, 1);
+        removed = true;
+      }
+    }
 
-  while (k < len) {
-    if (k in O && O[k] === searchElement) {
-      return k;
+    if (removed) {
+      this.cues.setCues_(this.cues_);
     }
-    k++;
   }
-  return -1;
+}
+
+/**
+ * cuechange - One or more cues in the track have become active or stopped being active.
+ */
+TextTrack.prototype.allowedEvents_ = {
+  cuechange: 'cuechange'
 };
 
 export default TextTrack;
diff --git a/src/js/utils/browser.js b/src/js/utils/browser.js
index 545776191c..fd43063792 100644
--- a/src/js/utils/browser.js
+++ b/src/js/utils/browser.js
@@ -15,8 +15,12 @@ const appleWebkitVersion = webkitVersionMap ? parseFloat(webkitVersionMap.pop())
  * @constant
  * @private
  */
-export const IS_IPHONE = (/iPhone/i).test(USER_AGENT);
 export const IS_IPAD = (/iPad/i).test(USER_AGENT);
+
+// The Facebook app's UIWebView identifies as both an iPhone and iPad, so
+// to identify iPhones, we need to exclude iPads.
+// http://artsy.github.io/blog/2012/10/18/the-perils-of-ios-user-agent-sniffing/
+export const IS_IPHONE = (/iPhone/i).test(USER_AGENT) && !IS_IPAD;
 export const IS_IPOD = (/iPod/i).test(USER_AGENT);
 export const IS_IOS = IS_IPHONE || IS_IPAD || IS_IPOD;
 
@@ -53,7 +57,8 @@ export const IS_OLD_ANDROID = IS_ANDROID && (/webkit/i).test(USER_AGENT) && ANDR
 export const IS_NATIVE_ANDROID = IS_ANDROID && ANDROID_VERSION < 5 && appleWebkitVersion < 537;
 
 export const IS_FIREFOX = (/Firefox/i).test(USER_AGENT);
-export const IS_CHROME = (/Chrome/i).test(USER_AGENT);
+export const IS_EDGE = (/Edge/i).test(USER_AGENT);
+export const IS_CHROME = !IS_EDGE && (/Chrome/i).test(USER_AGENT);
 export const IS_IE8 = (/MSIE\s8\.0/).test(USER_AGENT);
 
 export const TOUCH_ENABLED = !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch);
diff --git a/src/js/video.js b/src/js/video.js
index c4529c2612..74d7101e99 100644
--- a/src/js/video.js
+++ b/src/js/video.js
@@ -1,6 +1,7 @@
 /**
  * @file video.js
  */
+import window from 'global/window';
 import document from 'global/document';
 import * as setup from './setup';
 import * as stylesheet from './utils/stylesheet.js';
@@ -99,21 +100,24 @@ let videojs = function(id, options, ready){
 };
 
 // Add default styles
-let style = Dom.$('.vjs-styles-defaults');
-if (!style) {
-  style = stylesheet.createStyleElement('vjs-styles-defaults');
-  let head = Dom.$('head');
-  head.insertBefore(style, head.firstChild);
-  stylesheet.setTextContent(style, `
-    .video-js {
-      width: 300px;
-      height: 150px;
-    }
+if (window.VIDEOJS_NO_DYNAMIC_STYLE !== true) {
+  let style = Dom.$('.vjs-styles-defaults');
+
+  if (!style) {
+    style = stylesheet.createStyleElement('vjs-styles-defaults');
+    let head = Dom.$('head');
+    head.insertBefore(style, head.firstChild);
+    stylesheet.setTextContent(style, `
+      .video-js {
+        width: 300px;
+        height: 150px;
+      }
 
-    .vjs-fluid {
-      padding-top: 56.25%
-    }
-  `);
+      .vjs-fluid {
+        padding-top: 56.25%
+      }
+    `);
+  }
 }
 
 // Run Auto-load players
diff --git a/test/api/api.js b/test/api/api.js
index b0a12f1912..4bce4ca767 100644
--- a/test/api/api.js
+++ b/test/api/api.js
@@ -188,6 +188,7 @@ test('should export useful components to the public', function () {
   ok(videojs.getComponent('TextTrackButton'), 'TextTrackButton should be public');
   ok(videojs.getComponent('CaptionsButton'), 'CaptionsButton should be public');
   ok(videojs.getComponent('SubtitlesButton'), 'SubtitlesButton should be public');
+  ok(videojs.getComponent('DescriptionsButton'), 'DescriptionsButton should be public');
   ok(videojs.getComponent('ChaptersButton'), 'ChaptersButton should be public');
   ok(videojs.getComponent('ChaptersTrackMenuItem'), 'ChaptersTrackMenuItem should be public');
 
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 40326996aa..a4ec7de0c1 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -28,6 +28,7 @@ module.exports = function(config) {
 
     browserify: {
       debug: true,
+      plugin: ['proxyquireify/plugin'],
       transform: [
         require('babelify').configure({
           sourceMapRelative: './',
diff --git a/test/unit/clickable-component.test.js b/test/unit/clickable-component.test.js
index 1498b43a3a..b83b6c62e3 100644
--- a/test/unit/clickable-component.test.js
+++ b/test/unit/clickable-component.test.js
@@ -3,17 +3,38 @@ import TestHelpers from './test-helpers.js';
 
 q.module('ClickableComponent');
 
-test('should create a div with role="button"', function(){
+q.test('should create a div with role="button"', function(){
   expect(2);
 
-  var player, testClickableComponent, el;
+  let player = TestHelpers.makePlayer({});
 
-  player = TestHelpers.makePlayer({
-  });
-
-  testClickableComponent = new ClickableComponent(player);
-  el = testClickableComponent.createEl();
+  let testClickableComponent = new ClickableComponent(player);
+  let el = testClickableComponent.createEl();
 
   equal(el.nodeName.toLowerCase(), 'div', 'the name of the element is "div"');
   equal(el.getAttribute('role').toLowerCase(), 'button', 'the role of the element is "button"');
+
+  testClickableComponent.dispose();
+  player.dispose();
+});
+
+q.test('should be enabled/disabled', function(){
+  expect(3);
+
+  let player = TestHelpers.makePlayer({});
+
+  let testClickableComponent = new ClickableComponent(player);
+
+  equal(testClickableComponent.hasClass('vjs-disabled'), false, 'ClickableComponent defaults to enabled');
+
+  testClickableComponent.disable();
+
+  equal(testClickableComponent.hasClass('vjs-disabled'), true, 'ClickableComponent is disabled');
+
+  testClickableComponent.enable();
+
+  equal(testClickableComponent.hasClass('vjs-disabled'), false, 'ClickableComponent is enabled');
+
+  testClickableComponent.dispose();
+  player.dispose();
 });
diff --git a/test/unit/component.test.js b/test/unit/component.test.js
index 8315128b96..38d7ff0842 100644
--- a/test/unit/component.test.js
+++ b/test/unit/component.test.js
@@ -55,14 +55,43 @@ test('should add a child component', function(){
   ok(comp.getChildById(child.id()) === child);
 });
 
+test('should add a child component to an index', function(){
+  var comp = new Component(getFakePlayer());
+
+  var child = comp.addChild('component');
+
+  ok(comp.children().length === 1);
+  ok(comp.children()[0] === child);
+
+  var child0 = comp.addChild('component', {}, 0);
+  ok(comp.children().length === 2);
+  ok(comp.children()[0] === child0);
+  ok(comp.children()[1] === child);
+
+  var child1 = comp.addChild('component', {}, '2');
+  ok(comp.children().length === 3);
+  ok(comp.children()[2] === child1);
+
+  var child2 = comp.addChild('component', {}, undefined);
+  ok(comp.children().length === 4);
+  ok(comp.children()[3] === child2);
+
+  var child3 = comp.addChild('component', {}, -1);
+  ok(comp.children().length === 5);
+  ok(comp.children()[3] === child3);
+  ok(comp.children()[4] === child2);
+});
+
 test('addChild should throw if the child does not exist', function() {
   var comp = new Component(getFakePlayer());
 
   throws(function() {
-    comp.addChild('non-existent-child');
+   comp.addChild('non-existent-child');
   }, new Error('Component Non-existent-child does not exist'), 'addChild threw');
+
 });
 
+
 test('should init child components from options', function(){
   var comp = new Component(getFakePlayer(), {
     children: {
@@ -543,6 +572,34 @@ test('should change the width and height of a component', function(){
   ok(comp.height() === 0, 'forced height was removed');
 });
 
+test('should get the computed dimensions', function(){
+  const container = document.createElement('div');
+  const comp = new Component(getFakePlayer(), {});
+  const el = comp.el();
+  const fixture = document.getElementById('qunit-fixture');
+
+  const computedWidth = '500px';
+  const computedHeight = '500px';
+
+  fixture.appendChild(container);
+  container.appendChild(el);
+  // Container of el needs dimensions or the component won't have dimensions
+  container.style.width = '1000px';
+  container.style.height = '1000px';
+
+  comp.width('50%');
+  comp.height('50%');
+
+  equal(comp.currentWidth() + 'px', computedWidth, 'matches computed width');
+  equal(comp.currentHeight() + 'px', computedHeight, 'matches computed height');
+
+  equal(comp.currentDimension('width') + 'px', computedWidth, 'matches computed width');
+  equal(comp.currentDimension('height') + 'px', computedHeight, 'matches computed height');
+
+  equal(comp.currentDimensions()['width'] + 'px', computedWidth, 'matches computed width');
+  equal(comp.currentDimensions()['height'] + 'px', computedHeight, 'matches computed width');
+
+});
 
 test('should use a defined content el for appending children', function(){
   class CompWithContent extends Component {}
diff --git a/test/unit/menu.test.js b/test/unit/menu.test.js
index 5fbde6afcc..a7345e7ff9 100644
--- a/test/unit/menu.test.js
+++ b/test/unit/menu.test.js
@@ -1,21 +1,75 @@
 import MenuButton from '../../src/js/menu/menu-button.js';
 import TestHelpers from './test-helpers.js';
+import * as Events from '../../src/js/utils/events.js';
 
 q.module('MenuButton');
 
-test('should place title list item into ul', function() {
-  var player, menuButton;
+q.test('should not throw an error when there is no children', function() {
+  expect(0);
+  let player = TestHelpers.makePlayer();
+
+  let menuButton = new MenuButton(player);
+  let el = menuButton.el();
 
+  try {
+    Events.trigger(el, 'click');
+  } catch (error) {
+    ok(!error, 'click should not throw anything');
+  }
+
+  player.dispose();
+});
+
+q.test('should place title list item into ul', function() {
+  var player, menuButton;
   player = TestHelpers.makePlayer();
 
   menuButton = new MenuButton(player, {
     'title': 'testTitle'
   });
 
-  var menuContentElement = menuButton.el().getElementsByTagName('UL')[0];
-  var titleElement = menuContentElement.children[0];
+  let menuContentElement = menuButton.el().getElementsByTagName('UL')[0];
+  let titleElement = menuContentElement.children[0];
 
   ok(titleElement.innerHTML === 'TestTitle', 'title element placed in ul');
 
   player.dispose();
-});
\ No newline at end of file
+});
+
+q.test('clicking should display the menu', function() {
+  expect(6);
+
+  let player = TestHelpers.makePlayer();
+
+  // Make sure there's some content in the menu, even if it's just a title!
+  let menuButton = new MenuButton(player, {
+    'title': 'testTitle'
+  });
+  let el = menuButton.el();
+
+  ok(menuButton.menu !== undefined, 'menu is created');
+
+  equal(menuButton.menu.hasClass('vjs-lock-showing'), false, 'menu defaults to hidden');
+
+  Events.trigger(el, 'click');
+
+  equal(menuButton.menu.hasClass('vjs-lock-showing'), true, 'clicking on the menu button shows the menu');
+
+  Events.trigger(el, 'click');
+
+  equal(menuButton.menu.hasClass('vjs-lock-showing'), false, 'clicking again on the menu button hides the menu');
+
+  menuButton.disable();
+
+  Events.trigger(el, 'click');
+
+  equal(menuButton.menu.hasClass('vjs-lock-showing'), false, 'disable() prevents clicking from showing the menu');
+
+  menuButton.enable();
+
+  Events.trigger(el, 'click');
+
+  equal(menuButton.menu.hasClass('vjs-lock-showing'), true, 'enable() allows clicking to show the menu');
+
+  player.dispose();
+});
diff --git a/test/unit/player.test.js b/test/unit/player.test.js
index c2f7725ddc..8273820b64 100644
--- a/test/unit/player.test.js
+++ b/test/unit/player.test.js
@@ -87,29 +87,29 @@ test('should get tag, source, and track settings', function(){
   var tag = document.getElementById('example_1');
   var player = TestHelpers.makePlayer({}, tag);
 
-  ok(player.options_['autoplay'] === true);
-  ok(player.options_['preload'] === 'none'); // No extern. Use string.
-  ok(player.options_['id'] === 'example_1');
-  ok(player.options_['sources'].length === 2);
-  ok(player.options_['sources'][0].src === 'http://google.com');
-  ok(player.options_['sources'][0].type === 'video/mp4');
-  ok(player.options_['sources'][1].type === 'video/webm');
-  ok(player.options_['tracks'].length === 1);
-  ok(player.options_['tracks'][0]['kind'] === 'captions'); // No extern
-  ok(player.options_['tracks'][0]['attrtest'] === '');
-
-  ok(player.el().className.indexOf('video-js') !== -1, 'transferred class from tag to player div');
-  ok(player.el().id === 'example_1', 'transferred id from tag to player div');
-
-  ok(Player.players[player.id()] === player, 'player referenceable from global list');
-  ok(tag.id !== player.id, 'tag ID no longer is the same as player ID');
-  ok(tag.className !== player.el().className, 'tag classname updated');
+  equal(player.options_.autoplay, true, 'autoplay is set to true');
+  equal(player.options_.preload, 'none', 'preload is set to none');
+  equal(player.options_.id, 'example_1', 'id is set to example_1');
+  equal(player.options_.sources.length, 2, 'we have two sources');
+  equal(player.options_.sources[0].src, 'http://google.com', 'first source is google.com');
+  equal(player.options_.sources[0].type, 'video/mp4', 'first time is video/mp4');
+  equal(player.options_.sources[1].type, 'video/webm', 'second type is video/webm');
+  equal(player.options_.tracks.length, 1, 'we have one text track');
+  equal(player.options_.tracks[0].kind, 'captions', 'the text track is a captions file');
+  equal(player.options_.tracks[0].attrtest, '', 'we have an empty attribute called attrtest');
+
+  notEqual(player.el().className.indexOf('video-js'), -1, 'transferred class from tag to player div');
+  equal(player.el().id,'example_1', 'transferred id from tag to player div');
+
+  equal(Player.players[player.id()], player, 'player referenceable from global list');
+  notEqual(tag.id, player.id, 'tag ID no longer is the same as player ID');
+  notEqual(tag.className, player.el().className, 'tag classname updated');
 
   player.dispose();
 
-  ok(tag['player'] !== player, 'tag player ref killed');
+  notEqual(tag['player'], player, 'tag player ref killed');
   ok(!Player.players['example_1'], 'global player ref killed');
-  ok(player.el() === null, 'player el killed');
+  equal(player.el(), null, 'player el killed');
 });
 
 test('should asynchronously fire error events during source selection', function() {
@@ -741,6 +741,26 @@ test('should add an audio class if an audio el is used', function() {
   ok(player.el().className.indexOf(audioClass) !== -1, 'added '+ audioClass +' css class');
 });
 
+test('should add a video player region if a video el is used', function() {
+  var video = document.createElement('video'),
+      player = TestHelpers.makePlayer({}, video),
+      role = 'region',
+      label = 'video player';
+
+  ok(player.el().getAttribute('role') === 'region', 'region role is present');
+  ok(player.el().getAttribute('aria-label') === 'video player', 'video player label present');
+});
+
+test('should add an audio player region if an audio el is used', function() {
+  var audio = document.createElement('audio'),
+      player = TestHelpers.makePlayer({}, audio),
+      role = 'region',
+      label = 'audio player';
+
+  ok(player.el().getAttribute('role') === 'region', 'region role is present');
+  ok(player.el().getAttribute('aria-label') === 'audio player', 'audio player label present');
+});
+
 test('should not be scrubbing while not seeking', function(){
   var player = TestHelpers.makePlayer();
   equal(player.scrubbing(), false, 'player is not scrubbing');
@@ -943,3 +963,66 @@ test('player#reset loads the first item in the techOrder and then techCalls rese
   equal(loadedSource, null, 'with a null source');
   equal(techCallMethod, 'reset', 'we then reset the tech');
 });
+
+test('Remove waiting class on timeupdate after tech waiting', function() {
+  let player = TestHelpers.makePlayer();
+  player.tech_.trigger('waiting');
+  ok(/vjs-waiting/.test(player.el().className), 'vjs-waiting is added to the player el on tech waiting');
+  player.trigger('timeupdate');
+  ok(!/vjs-waiting/.test(player.el().className), 'vjs-waiting is removed from the player el on timeupdate');
+});
+
+test('Make sure that player\'s style el respects VIDEOJS_NO_DYNAMIC_STYLE option', function() {
+  // clear the HEAD before running this test
+  let styles = document.querySelectorAll('style');
+  let i = styles.length;
+  while (i--) {
+    let style = styles[i];
+    style.parentNode.removeChild(style);
+  }
+
+  let tag = TestHelpers.makeTag();
+  tag.id = 'vjs-no-base-theme-tag';
+  tag.width = 600;
+  tag.height = 300;
+
+  window.VIDEOJS_NO_DYNAMIC_STYLE = true;
+  let player = TestHelpers.makePlayer({}, tag);
+  styles = document.querySelectorAll('style');
+  equal(styles.length, 0, 'we should not get any style elements included in the DOM');
+
+  window.VIDEOJS_NO_DYNAMIC_STYLE = false;
+  tag = TestHelpers.makeTag();
+  player = TestHelpers.makePlayer({}, tag);
+  styles = document.querySelectorAll('style');
+  equal(styles.length, 1, 'we should have one style element in the DOM');
+  equal(styles[0].className, 'vjs-styles-dimensions', 'the class name is the one we expected');
+});
+
+test('When VIDEOJS_NO_DYNAMIC_STYLE is set, apply sizing directly to the tech el', function() {
+  // clear the HEAD before running this test
+  let styles = document.querySelectorAll('style');
+  let i = styles.length;
+  while (i--) {
+    let style = styles[i];
+    style.parentNode.removeChild(style);
+  }
+
+  let tag = TestHelpers.makeTag();
+  tag.id = 'vjs-no-base-theme-tag';
+  tag.width = 600;
+  tag.height = 300;
+
+  window.VIDEOJS_NO_DYNAMIC_STYLE = true;
+  let player = TestHelpers.makePlayer({}, tag);
+
+  player.width(300);
+  player.height(600);
+  equal(player.tech_.el().width, 300, 'the width is equal to 300');
+  equal(player.tech_.el().height, 600, 'the height is equal 600');
+
+  player.width(600);
+  player.height(300);
+  equal(player.tech_.el().width, 600, 'the width is equal to 600');
+  equal(player.tech_.el().height, 300, 'the height is equal 300');
+});
diff --git a/test/unit/tracks/html-track-element-list.test.js b/test/unit/tracks/html-track-element-list.test.js
index 38d52040db..6a69aff4a3 100644
--- a/test/unit/tracks/html-track-element-list.test.js
+++ b/test/unit/tracks/html-track-element-list.test.js
@@ -2,30 +2,29 @@ import HTMLTrackElement from '../../../src/js/tracks/html-track-element.js';
 import HTMLTrackElementList from '../../../src/js/tracks/html-track-element-list.js';
 import TextTrack from '../../../src/js/tracks/text-track.js';
 
-let noop = Function.prototype;
-let defaultTech = {
-  textTracks: noop,
-  on: noop,
-  off: noop,
-  currentTime: noop
+const defaultTech = {
+  textTracks() {},
+  on() {},
+  off() {},
+  currentTime() {}
 };
 
-let track1 = new TextTrack({
+const track1 = new TextTrack({
   id: 1,
   tech: defaultTech
 });
-let track2 = new TextTrack({
+const track2 = new TextTrack({
   id: 2,
   tech: defaultTech
 });
 
-var genericHtmlTrackElements = [{
+const genericHtmlTrackElements = [{
+  tech() {},
   kind: 'captions',
-  tech: noop,
   track: track1
 }, {
+  tech() {},
   kind: 'chapters',
-  tech: noop,
   track: track2
 }];
 
@@ -47,9 +46,9 @@ test('can get html track element by track', function() {
 test('length is updated when new tracks are added or removed', function() {
   let htmlTrackElementList = new HTMLTrackElementList(genericHtmlTrackElements);
 
-  htmlTrackElementList.addTrackElement_({tech: noop});
+  htmlTrackElementList.addTrackElement_({tech() {}});
   equal(htmlTrackElementList.length, genericHtmlTrackElements.length + 1, `the length is ${genericHtmlTrackElements.length + 1}`);
-  htmlTrackElementList.addTrackElement_({tech: noop});
+  htmlTrackElementList.addTrackElement_({tech() {}});
   equal(htmlTrackElementList.length, genericHtmlTrackElements.length + 2, `the length is ${genericHtmlTrackElements.length + 2}`);
 
   htmlTrackElementList.removeTrackElement_(htmlTrackElementList.getTrackElementByTrack_(track1));
diff --git a/test/unit/tracks/html-track-element.test.js b/test/unit/tracks/html-track-element.test.js
index d00dc0fec6..063f0f9287 100644
--- a/test/unit/tracks/html-track-element.test.js
+++ b/test/unit/tracks/html-track-element.test.js
@@ -2,12 +2,11 @@ import HTMLTrackElement from '../../../src/js/tracks/html-track-element.js';
 import TextTrack from '../../../src/js/tracks/text-track.js';
 import window from 'global/window';
 
-let noop = Function.prototype;
-let defaultTech = {
-  textTracks: noop,
-  on: noop,
-  off: noop,
-  currentTime: noop
+const defaultTech = {
+  textTracks() {},
+  on() {},
+  off() {},
+  currentTime() {}
 };
 
 q.module('HTML Track Element');
@@ -23,12 +22,12 @@ test('html track element requires a tech', function() {
 });
 
 test('can create a html track element with various properties', function() {
-  let kind = 'chapters',
-      label = 'English',
-      language = 'en',
-      src = 'http://www.example.com';
+  let kind = 'chapters';
+  let label = 'English';
+  let language = 'en';
+  let src = 'http://www.example.com';
 
-  let htmlTrackElement = new  HTMLTrackElement({
+  let htmlTrackElement = new HTMLTrackElement({
     kind,
     label,
     language,
@@ -36,7 +35,7 @@ test('can create a html track element with various properties', function() {
     tech: defaultTech
   });
 
-  equal(htmlTrackElement.default, undefined, 'we have a default');
+  equal(typeof htmlTrackElement.default, 'undefined', 'we have a default');
   equal(htmlTrackElement.kind, kind, 'we have a kind');
   equal(htmlTrackElement.label, label, 'we have a label');
   equal(htmlTrackElement.readyState, 0, 'we have a readyState');
@@ -46,29 +45,29 @@ test('can create a html track element with various properties', function() {
 });
 
 test('defaults when items not provided', function() {
-  let htmlTrackElement = new  HTMLTrackElement({
+  let htmlTrackElement = new HTMLTrackElement({
     tech: defaultTech
   });
 
-  equal(htmlTrackElement.default, undefined, 'we have a default');
+  equal(typeof htmlTrackElement.default, 'undefined', 'we have a default');
   equal(htmlTrackElement.kind, 'subtitles', 'we have a kind');
   equal(htmlTrackElement.label, '', 'we have a label');
   equal(htmlTrackElement.readyState, 0, 'we have a readyState');
-  equal(htmlTrackElement.src, undefined, 'we have a src');
+  equal(typeof htmlTrackElement.src, 'undefined', 'we have a src');
   equal(htmlTrackElement.srclang, '', 'we have a srclang');
   equal(htmlTrackElement.track.cues.length, 0, 'we have a track');
 });
 
 test('fires loadeddata when track cues become populated', function() {
-  let changes = 0,
-      loadHandler;
+  let changes = 0;
+  let loadHandler;
 
   loadHandler = function() {
     changes++;
   };
 
   let htmlTrackElement = new HTMLTrackElement({
-    tech: noop
+    tech() {}
   });
 
   htmlTrackElement.addEventListener('load', loadHandler);
diff --git a/test/unit/tracks/text-track-controls.test.js b/test/unit/tracks/text-track-controls.test.js
index 5e7aa1fb1c..27aa442521 100644
--- a/test/unit/tracks/text-track-controls.test.js
+++ b/test/unit/tracks/text-track-controls.test.js
@@ -3,15 +3,15 @@ import TestHelpers from '../test-helpers.js';
 import * as browser from '../../../src/js/utils/browser.js';
 
 q.module('Text Track Controls', {
-  'setup': function() {
+  setup() {
     this.clock = sinon.useFakeTimers();
   },
-  'teardown': function() {
+  teardown() {
     this.clock.restore();
   }
 });
 
-var track = {
+const track = {
   kind: 'captions',
   label: 'test'
 };
@@ -30,7 +30,7 @@ test('should be displayed when text tracks list is not empty', function() {
 });
 
 test('should be displayed when a text track is added to an empty track list', function() {
-  var player = TestHelpers.makePlayer();
+  let player = TestHelpers.makePlayer();
 
   player.addRemoteTextTrack(track);
 
@@ -41,7 +41,7 @@ test('should be displayed when a text track is added to an empty track list', fu
 });
 
 test('should not be displayed when text tracks list is empty', function() {
-  var player = TestHelpers.makePlayer();
+  let player = TestHelpers.makePlayer();
 
   ok(player.controlBar.captionsButton.hasClass('vjs-hidden'), 'control is not displayed');
   equal(player.textTracks().length, 0, 'textTracks is empty');
@@ -50,7 +50,7 @@ test('should not be displayed when text tracks list is empty', function() {
 });
 
 test('should not be displayed when last text track is removed', function() {
-  var player = TestHelpers.makePlayer({
+  let player = TestHelpers.makePlayer({
     tracks: [track]
   });
 
@@ -63,10 +63,10 @@ test('should not be displayed when last text track is removed', function() {
 });
 
 test('menu should contain "Settings", "Off" and one track', function() {
-  var player = TestHelpers.makePlayer({
-      tracks: [track]
-    }),
-    menuItems;
+  let player = TestHelpers.makePlayer({
+    tracks: [track]
+  });
+  let menuItems;
 
   this.clock.tick(1000);
 
@@ -81,7 +81,7 @@ test('menu should contain "Settings", "Off" and one track', function() {
 });
 
 test('menu should update with addRemoteTextTrack', function() {
-  var player = TestHelpers.makePlayer({
+  let player = TestHelpers.makePlayer({
     tracks: [track]
   });
 
@@ -96,7 +96,7 @@ test('menu should update with addRemoteTextTrack', function() {
 });
 
 test('menu should update with removeRemoteTextTrack', function() {
-  var player = TestHelpers.makePlayer({
+  let player = TestHelpers.makePlayer({
     tracks: [track, track]
   });
 
@@ -110,20 +110,143 @@ test('menu should update with removeRemoteTextTrack', function() {
   player.dispose();
 });
 
+let descriptionstrack = {
+  kind: 'descriptions',
+  label: 'desc'
+};
+
+test('descriptions should be displayed when text tracks list is not empty', function() {
+  let player = TestHelpers.makePlayer({
+    tracks: [descriptionstrack]
+  });
+
+  this.clock.tick(1000);
+
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-hidden'), 'descriptions control is displayed');
+  equal(player.textTracks().length, 1, 'textTracks contains one item');
+
+  player.dispose();
+});
+
+test('descriptions should be displayed when a text track is added to an empty track list', function() {
+  let player = TestHelpers.makePlayer();
+
+  player.addRemoteTextTrack(descriptionstrack);
+
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-hidden'), 'control is displayed');
+  equal(player.textTracks().length, 1, 'textTracks contains one item');
+
+  player.dispose();
+});
+
+test('descriptions should not be displayed when text tracks list is empty', function() {
+  let player = TestHelpers.makePlayer();
+
+  ok(player.controlBar.descriptionsButton.hasClass('vjs-hidden'), 'control is not displayed');
+  equal(player.textTracks().length, 0, 'textTracks is empty');
+
+  player.dispose();
+});
+
+test('descriptions should not be displayed when last text track is removed', function() {
+  let player = TestHelpers.makePlayer({
+    tracks: [descriptionstrack]
+  });
+
+  player.removeRemoteTextTrack(player.textTracks()[0]);
+
+  ok(player.controlBar.descriptionsButton.hasClass('vjs-hidden'), 'control is not displayed');
+  equal(player.textTracks().length, 0, 'textTracks is empty');
+
+  player.dispose();
+});
+
+test('descriptions menu should contain "Off" and one track', function() {
+  let player = TestHelpers.makePlayer({
+      tracks: [descriptionstrack]
+    }),
+    menuItems;
+
+  this.clock.tick(1000);
+
+  menuItems = player.controlBar.descriptionsButton.items;
+
+  equal(menuItems.length, 2, 'descriptions menu contains two items');
+  equal(menuItems[0].track.label, 'descriptions off', 'menu contains "descriptions off"');
+  equal(menuItems[1].track.label, 'desc', 'menu contains "desc" track');
+
+  player.dispose();
+});
+
+test('enabling a captions track should disable the descriptions menu button', function() {
+  expect(14);
+
+  let player = TestHelpers.makePlayer({
+    tracks: [track, descriptionstrack]
+  });
+
+  this.clock.tick(1000);
+
+  ok(!player.controlBar.captionsButton.hasClass('vjs-hidden'), 'captions control is displayed');
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-hidden'), 'descriptions control is displayed');
+  equal(player.textTracks().length, 2, 'textTracks contains two items');
+
+  ok(!player.controlBar.captionsButton.hasClass('vjs-disabled'), 'captions control is NOT disabled');
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-disabled'), 'descriptions control is NOT disabled');
+
+  for (let i = 0; i < player.textTracks().length; i++) {
+    if (player.textTracks()[i].kind === 'descriptions') {
+      player.textTracks()[i].mode = 'showing';
+      ok(player.textTracks()[i].kind === 'descriptions' && player.textTracks()[i].mode === 'showing', 'descriptions mode set to showing');
+    }
+  }
+
+  this.clock.tick(1000);
+
+  ok(!player.controlBar.captionsButton.hasClass('vjs-disabled'), 'captions control is NOT disabled');
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-disabled'), 'descriptions control is NOT disabled');
+
+  for (let i = 0; i < player.textTracks().length; i++) {
+    if (player.textTracks()[i].kind === 'captions') {
+      player.textTracks()[i].mode = 'showing';
+      ok(player.textTracks()[i].kind === 'captions' && player.textTracks()[i].mode === 'showing', 'captions mode set to showing');
+    }
+  }
+
+  this.clock.tick(1000);
+
+  ok(!player.controlBar.captionsButton.hasClass('vjs-disabled'), 'captions control is NOT disabled');
+  ok(player.controlBar.descriptionsButton.hasClass('vjs-disabled'), 'descriptions control IS disabled');
+
+  for (let i = 0; i < player.textTracks().length; i++) {
+    if (player.textTracks()[i].kind === 'captions') {
+      player.textTracks()[i].mode = 'disabled';
+      ok(player.textTracks()[i].kind === 'captions' && player.textTracks()[i].mode === 'disabled', 'captions mode set to disabled');
+    }
+  }
+
+  this.clock.tick(1000);
+
+  ok(!player.controlBar.captionsButton.hasClass('vjs-disabled'), 'captions control is NOT disabled');
+  ok(!player.controlBar.descriptionsButton.hasClass('vjs-disabled'), 'descriptions control is NOT disabled');
+
+  player.dispose();
+});
+
 if (!browser.IS_IE8) {
   // This test doesn't work on IE8.
   // However, this test tests a specific with iOS7 where the TextTrackList doesn't report track mode changes.
   // TODO: figure out why this test doens't work on IE8. https://github.com/videojs/video.js/issues/1861
   test('menu items should polyfill mode change events', function() {
-    var player = TestHelpers.makePlayer({}),
-        changes,
-        trackMenuItem;
+    let player = TestHelpers.makePlayer({});
+    let changes;
+    let trackMenuItem;
 
     // emulate a TextTrackList that doesn't report track mode changes,
     // like iOS7
     player.textTracks().onchange = undefined;
     trackMenuItem = new TextTrackMenuItem(player, {
-      track: track
+      track
     });
 
     player.textTracks().on('change', function() {
diff --git a/test/unit/tracks/text-track-cue-list.test.js b/test/unit/tracks/text-track-cue-list.test.js
index c9f15e8309..fdcceba5b0 100644
--- a/test/unit/tracks/text-track-cue-list.test.js
+++ b/test/unit/tracks/text-track-cue-list.test.js
@@ -1,6 +1,6 @@
 import TextTrackCueList from '../../../src/js/tracks/text-track-cue-list.js';
 
-let genericTracks = [
+const genericTracks = [
   {
     id: '1'
   }, {
@@ -13,13 +13,13 @@ let genericTracks = [
 q.module('Text Track Cue List');
 
 test('TextTrackCueList\'s length is set correctly', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   equal(ttcl.length, genericTracks.length, 'the length is ' + genericTracks.length);
 });
 
 test('can get cues by id', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   equal(ttcl.getCueById('1').id, 1, 'id "1" has id of "1"');
   equal(ttcl.getCueById('2').id, 2, 'id "2" has id of "2"');
@@ -28,7 +28,7 @@ test('can get cues by id', function() {
 });
 
 test('length is updated when new tracks are added or removed', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   ttcl.setCues_(genericTracks.concat([{id: '100'}]));
   equal(ttcl.length, genericTracks.length + 1, 'the length is ' + (genericTracks.length + 1));
@@ -42,9 +42,9 @@ test('length is updated when new tracks are added or removed', function() {
 });
 
 test('can access items by index', function() {
-  var ttcl = new TextTrackCueList(genericTracks),
-      i = 0,
-      length = ttcl.length;
+  let ttcl = new TextTrackCueList(genericTracks);
+  let i = 0;
+  let length = ttcl.length;
 
   expect(length);
 
@@ -54,7 +54,7 @@ test('can access items by index', function() {
 });
 
 test('can access new items by index', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   ttcl.setCues_(genericTracks.concat([{id: '100'}]));
 
@@ -64,7 +64,7 @@ test('can access new items by index', function() {
 });
 
 test('cannot access removed items by index', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   ttcl.setCues_(genericTracks.concat([{id: '100'}, {id: '101'}]));
   equal(ttcl[3].id, '100', 'id of item at index 3 is 100');
@@ -77,7 +77,7 @@ test('cannot access removed items by index', function() {
 });
 
 test('new item available at old index', function() {
-  var ttcl = new TextTrackCueList(genericTracks);
+  let ttcl = new TextTrackCueList(genericTracks);
 
   ttcl.setCues_(genericTracks.concat([{id: '100'}]));
   equal(ttcl[3].id, '100', 'id of item at index 3 is 100');
diff --git a/test/unit/tracks/text-track-list-converter.test.js b/test/unit/tracks/text-track-list-converter.test.js
index 6cb19fe874..b1696f489c 100644
--- a/test/unit/tracks/text-track-list-converter.test.js
+++ b/test/unit/tracks/text-track-list-converter.test.js
@@ -3,7 +3,6 @@ import TextTrack from '../../../src/js/tracks/text-track.js';
 import TextTrackList from '../../../src/js/tracks/text-track-list.js';
 import Html5 from '../../../src/js/tech/html5.js';
 import document from 'global/document';
-import window from 'global/window';
 
 q.module('Text Track List Converter', {});
 
@@ -26,6 +25,7 @@ let cleanup = (item) => {
 if (Html5.supportsNativeTextTracks()) {
   q.test('trackToJson_ produces correct representation for native track object', function(a) {
     let track = document.createElement('track');
+
     track.src = 'example.com/english.vtt';
     track.kind = 'captions';
     track.srclang = 'en';
@@ -48,11 +48,13 @@ if (Html5.supportsNativeTextTracks()) {
     });
 
     let nativeTrack = document.createElement('track');
+
     nativeTrack.kind = 'captions';
     nativeTrack.srclang = 'es';
     nativeTrack.label = 'Spanish';
 
     let tt = new TextTrackList();
+
     tt.addTrack_(nativeTrack.track);
     tt.addTrack_(emulatedTrack);
 
@@ -96,12 +98,14 @@ if (Html5.supportsNativeTextTracks()) {
     });
 
     let nativeTrack = document.createElement('track');
+
     nativeTrack.src = 'example.com/spanish.vtt';
     nativeTrack.kind = 'captions';
     nativeTrack.srclang = 'es';
     nativeTrack.label = 'Spanish';
 
     let tt = new TextTrackList();
+
     tt.addTrack_(nativeTrack.track);
     tt.addTrack_(emulatedTrack);
 
@@ -171,6 +175,7 @@ q.test('textTracksToJson produces good json output for emulated only', function(
   });
 
   let tt = new TextTrackList();
+
   tt.addTrack_(anotherTrack);
   tt.addTrack_(emulatedTrack);
 
@@ -224,6 +229,7 @@ q.test('jsonToTextTracks calls addRemoteTextTrack on the tech with emulated trac
   });
 
   let tt = new TextTrackList();
+
   tt.addTrack_(anotherTrack);
   tt.addTrack_(emulatedTrack);
 
diff --git a/test/unit/tracks/text-track-list.test.js b/test/unit/tracks/text-track-list.test.js
index 8306d3daee..e12d94f4b7 100644
--- a/test/unit/tracks/text-track-list.test.js
+++ b/test/unit/tracks/text-track-list.test.js
@@ -2,30 +2,32 @@ import TextTrackList from '../../../src/js/tracks/text-track-list.js';
 import TextTrack from '../../../src/js/tracks/text-track.js';
 import EventTarget from '../../../src/js/event-target.js';
 
-var noop = Function.prototype;
-var genericTracks = [
+const genericTracks = [
   {
     id: '1',
-    addEventListener: noop
+    addEventListener() {},
+    off() {}
   }, {
     id: '2',
-    addEventListener: noop
+    addEventListener() {},
+    off() {}
   }, {
     id: '3',
-    addEventListener: noop
+    addEventListener() {},
+    off() {}
   }
 ];
 
 q.module('Text Track List');
 
 test('TextTrackList\'s length is set correctly', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
   equal(ttl.length, genericTracks.length, 'the length is ' + genericTracks.length);
 });
 
 test('can get text tracks by id', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
   equal(ttl.getTrackById('1').id, 1, 'id "1" has id of "1"');
   equal(ttl.getTrackById('2').id, 2, 'id "2" has id of "2"');
@@ -34,11 +36,11 @@ test('can get text tracks by id', function() {
 });
 
 test('length is updated when new tracks are added or removed', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
-  ttl.addTrack_({id: '100', addEventListener: noop});
+  ttl.addTrack_({id: '100', addEventListener() {}, off() {}});
   equal(ttl.length, genericTracks.length + 1, 'the length is ' + (genericTracks.length + 1));
-  ttl.addTrack_({id: '101', addEventListener: noop});
+  ttl.addTrack_({id: '101', addEventListener() {}, off() {}});
   equal(ttl.length, genericTracks.length + 2, 'the length is ' + (genericTracks.length + 2));
 
   ttl.removeTrack_(ttl.getTrackById('101'));
@@ -48,9 +50,9 @@ test('length is updated when new tracks are added or removed', function() {
 });
 
 test('can access items by index', function() {
-  var ttl = new TextTrackList(genericTracks),
-      i = 0,
-      length = ttl.length;
+  let ttl = new TextTrackList(genericTracks);
+  let i = 0;
+  let length = ttl.length;
 
   expect(length);
 
@@ -60,19 +62,19 @@ test('can access items by index', function() {
 });
 
 test('can access new items by index', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
-  ttl.addTrack_({id: '100', addEventListener: noop});
+  ttl.addTrack_({id: '100', addEventListener() {}});
   equal(ttl[3].id, '100', 'id of item at index 3 is 100');
-  ttl.addTrack_({id: '101', addEventListener: noop});
+  ttl.addTrack_({id: '101', addEventListener() {}});
   equal(ttl[4].id, '101', 'id of item at index 4 is 101');
 });
 
 test('cannot access removed items by index', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
-  ttl.addTrack_({id: '100', addEventListener: noop});
-  ttl.addTrack_({id: '101', addEventListener: noop});
+  ttl.addTrack_({id: '100', addEventListener() {}, off() {}});
+  ttl.addTrack_({id: '101', addEventListener() {}, off() {}});
   equal(ttl[3].id, '100', 'id of item at index 3 is 100');
   equal(ttl[4].id, '101', 'id of item at index 4 is 101');
 
@@ -84,51 +86,55 @@ test('cannot access removed items by index', function() {
 });
 
 test('new item available at old index', function() {
-  var ttl = new TextTrackList(genericTracks);
+  let ttl = new TextTrackList(genericTracks);
 
-  ttl.addTrack_({id: '100', addEventListener: noop});
+  ttl.addTrack_({id: '100', addEventListener() {}, off() {}});
   equal(ttl[3].id, '100', 'id of item at index 3 is 100');
 
   ttl.removeTrack_(ttl.getTrackById('100'));
   ok(!ttl[3], 'nothing at index 3');
 
-  ttl.addTrack_({id: '101', addEventListener: noop});
+  ttl.addTrack_({id: '101', addEventListener() {}});
   equal(ttl[3].id, '101', 'id of new item at index 3 is now 101');
 });
 
 test('a "addtrack" event is triggered when new tracks are added', function() {
-  var ttl = new TextTrackList(genericTracks),
-      tracks = 0,
-      adds = 0,
-      addHandler = function(e) {
-        e.track && tracks++;
-        adds++;
-      };
+  let ttl = new TextTrackList(genericTracks);
+  let tracks = 0;
+  let adds = 0;
+  let addHandler = function(e) {
+    if (e.track) {
+      tracks++;
+    }
+    adds++;
+  };
 
   ttl.on('addtrack', addHandler);
 
-  ttl.addTrack_({id: '100', addEventListener: noop});
-  ttl.addTrack_({id: '101', addEventListener: noop});
+  ttl.addTrack_({id: '100', addEventListener() {}});
+  ttl.addTrack_({id: '101', addEventListener() {}});
 
   ttl.off('addtrack', addHandler);
 
   ttl.onaddtrack = addHandler;
 
-  ttl.addTrack_({id: '102', addEventListener: noop});
-  ttl.addTrack_({id: '103', addEventListener: noop});
+  ttl.addTrack_({id: '102', addEventListener() {}});
+  ttl.addTrack_({id: '103', addEventListener() {}});
 
   equal(adds, 4, 'we got ' + adds + ' "addtrack" events');
   equal(tracks, 4, 'we got a track with every event');
 });
 
 test('a "removetrack" event is triggered when tracks are removed', function() {
-  var ttl = new TextTrackList(genericTracks),
-      tracks = 0,
-      rms = 0,
-      rmHandler = function(e) {
-        e.track && tracks++;
-        rms++;
-      };
+  let ttl = new TextTrackList(genericTracks);
+  let tracks = 0;
+  let rms = 0;
+  let rmHandler = function(e) {
+    if (e.track) {
+      tracks++;
+    }
+    rms++;
+  };
 
   ttl.on('removetrack', rmHandler);
 
@@ -146,12 +152,12 @@ test('a "removetrack" event is triggered when tracks are removed', function() {
 });
 
 test('trigger "change" event when "modechange" is fired on a track', function() {
-  var tt = new EventTarget(),
-      ttl = new TextTrackList([tt]),
-      changes = 0,
-      changeHandler = function() {
-        changes++;
-      };
+  let tt = new EventTarget();
+  let ttl = new TextTrackList([tt]);
+  let changes = 0;
+  let changeHandler = function() {
+    changes++;
+  };
 
   ttl.on('change', changeHandler);
 
@@ -167,16 +173,16 @@ test('trigger "change" event when "modechange" is fired on a track', function()
 });
 
 test('trigger "change" event when mode changes on a TextTrack', function() {
-  var tt = new TextTrack({
-        tech: {
-          on: noop
-        }
-      }),
-      ttl = new TextTrackList([tt]),
-      changes = 0,
-      changeHandler = function() {
-        changes++;
-      };
+  let tt = new TextTrack({
+    tech: {
+      on() {}
+    }
+  });
+  let ttl = new TextTrackList([tt]);
+  let changes = 0;
+  let changeHandler = function() {
+    changes++;
+  };
 
   ttl.on('change', changeHandler);
 
diff --git a/test/unit/tracks/text-track-settings.test.js b/test/unit/tracks/text-track-settings.test.js
index d0e16cd6cd..a486a82212 100644
--- a/test/unit/tracks/text-track-settings.test.js
+++ b/test/unit/tracks/text-track-settings.test.js
@@ -4,33 +4,33 @@ import * as Events from '../../../src/js/utils/events.js';
 import safeParseTuple from 'safe-json-parse/tuple';
 import window from 'global/window';
 
-var tracks = [{
+const tracks = [{
   kind: 'captions',
   label: 'test'
 }];
 
 q.module('Text Track Settings', {
-  beforeEach: function() {
+  beforeEach() {
     window.localStorage.clear();
   }
 });
 
 test('should update settings', function() {
-  var player = TestHelpers.makePlayer({
-      tracks: tracks,
-      persistTextTrackSettings: true
-    }),
-    newSettings = {
-      'backgroundOpacity': '1',
-      'textOpacity': '1',
-      'windowOpacity': '1',
-      'edgeStyle': 'raised',
-      'fontFamily': 'monospaceSerif',
-      'color': '#FFF',
-      'backgroundColor': '#FFF',
-      'windowColor': '#FFF',
-      'fontPercent': 1.25
-    };
+  let player = TestHelpers.makePlayer({
+    tracks,
+    persistTextTrackSettings: true
+  });
+  let newSettings = {
+    backgroundOpacity: '1',
+    textOpacity: '1',
+    windowOpacity: '1',
+    edgeStyle: 'raised',
+    fontFamily: 'monospaceSerif',
+    color: '#FFF',
+    backgroundColor: '#FFF',
+    windowColor: '#FFF',
+    fontPercent: 1.25
+  };
 
   player.textTrackSettings.setValues(newSettings);
   deepEqual(player.textTrackSettings.getValues(), newSettings, 'values are updated');
@@ -52,8 +52,8 @@ test('should update settings', function() {
 });
 
 test('should restore default settings', function() {
-  var player = TestHelpers.makePlayer({
-    tracks: tracks,
+  let player = TestHelpers.makePlayer({
+    tracks,
     persistTextTrackSettings: true
   });
 
@@ -88,9 +88,10 @@ test('should restore default settings', function() {
 });
 
 test('should open on click', function() {
-  var player = TestHelpers.makePlayer({
-    tracks: tracks
+  let player = TestHelpers.makePlayer({
+    tracks
   });
+
   Events.trigger(player.$('.vjs-texttrack-settings'), 'click');
   ok(!player.textTrackSettings.hasClass('vjs-hidden'), 'settings open');
 
@@ -98,9 +99,10 @@ test('should open on click', function() {
 });
 
 test('should close on done click', function() {
-  var player = TestHelpers.makePlayer({
-    tracks: tracks
+  let player = TestHelpers.makePlayer({
+    tracks
   });
+
   Events.trigger(player.$('.vjs-texttrack-settings'), 'click');
   Events.trigger(player.$('.vjs-done-button'), 'click');
   ok(player.textTrackSettings.hasClass('vjs-hidden'), 'settings closed');
@@ -109,16 +111,16 @@ test('should close on done click', function() {
 });
 
 test('if persist option is set, restore settings on init', function() {
-  var player,
-      oldRestoreSettings = TextTrackSettings.prototype.restoreSettings,
-      restore = 0;
+  let player;
+  let oldRestoreSettings = TextTrackSettings.prototype.restoreSettings;
+  let restore = 0;
 
   TextTrackSettings.prototype.restoreSettings = function() {
     restore++;
   };
 
   player = TestHelpers.makePlayer({
-    tracks: tracks,
+    tracks,
     persistTextTrackSettings: true
   });
 
@@ -130,12 +132,12 @@ test('if persist option is set, restore settings on init', function() {
 });
 
 test('if persist option is set, save settings when "done"', function() {
-  var player = TestHelpers.makePlayer({
-        tracks: tracks,
-        persistTextTrackSettings: true
-      }),
-      oldSaveSettings = TextTrackSettings.prototype.saveSettings,
-      save = 0;
+  let player = TestHelpers.makePlayer({
+    tracks,
+    persistTextTrackSettings: true
+  });
+  let oldSaveSettings = TextTrackSettings.prototype.saveSettings;
+  let save = 0;
 
   TextTrackSettings.prototype.saveSettings = function() {
     save++;
@@ -151,11 +153,11 @@ test('if persist option is set, save settings when "done"', function() {
 });
 
 test('do not try to restore or save settings if persist option is not set', function() {
-  var player,
-      oldRestoreSettings = TextTrackSettings.prototype.restoreSettings,
-      oldSaveSettings = TextTrackSettings.prototype.saveSettings,
-      save = 0,
-      restore = 0;
+  let player;
+  let oldRestoreSettings = TextTrackSettings.prototype.restoreSettings;
+  let oldSaveSettings = TextTrackSettings.prototype.saveSettings;
+  let save = 0;
+  let restore = 0;
 
   TextTrackSettings.prototype.restoreSettings = function() {
     restore++;
@@ -165,7 +167,7 @@ test('do not try to restore or save settings if persist option is not set', func
   };
 
   player = TestHelpers.makePlayer({
-    tracks: tracks,
+    tracks,
     persistTextTrackSettings: false
   });
 
@@ -183,23 +185,23 @@ test('do not try to restore or save settings if persist option is not set', func
 });
 
 test('should restore saved settings', function() {
-  var player,
-    newSettings = {
-      'backgroundOpacity': '1',
-      'textOpacity': '1',
-      'windowOpacity': '1',
-      'edgeStyle': 'raised',
-      'fontFamily': 'monospaceSerif',
-      'color': '#FFF',
-      'backgroundColor': '#FFF',
-      'windowColor': '#FFF',
-      'fontPercent': 1.25
-    };
+  let player;
+  let newSettings = {
+    backgroundOpacity: '1',
+    textOpacity: '1',
+    windowOpacity: '1',
+    edgeStyle: 'raised',
+    fontFamily: 'monospaceSerif',
+    color: '#FFF',
+    backgroundColor: '#FFF',
+    windowColor: '#FFF',
+    fontPercent: 1.25
+  };
 
   window.localStorage.setItem('vjs-text-track-settings', JSON.stringify(newSettings));
 
   player = TestHelpers.makePlayer({
-    tracks: tracks,
+    tracks,
     persistTextTrackSettings: true
   });
 
@@ -209,23 +211,23 @@ test('should restore saved settings', function() {
 });
 
 test('should not restore saved settings', function() {
-  var player,
-    newSettings = {
-      'backgroundOpacity': '1',
-      'textOpacity': '1',
-      'windowOpacity': '1',
-      'edgeStyle': 'raised',
-      'fontFamily': 'monospaceSerif',
-      'color': '#FFF',
-      'backgroundColor': '#FFF',
-      'windowColor': '#FFF',
-      'fontPercent': 1.25
-    };
+  let player;
+  let newSettings = {
+    backgroundOpacity: '1',
+    textOpacity: '1',
+    windowOpacity: '1',
+    edgeStyle: 'raised',
+    fontFamily: 'monospaceSerif',
+    color: '#FFF',
+    backgroundColor: '#FFF',
+    windowColor: '#FFF',
+    fontPercent: 1.25
+  };
 
   window.localStorage.setItem('vjs-text-track-settings', JSON.stringify(newSettings));
 
   player = TestHelpers.makePlayer({
-    tracks: tracks,
+    tracks,
     persistTextTrackSettings: false
   });
 
diff --git a/test/unit/tracks/text-track.test.js b/test/unit/tracks/text-track.test.js
index fc59cf97d9..523f94953f 100644
--- a/test/unit/tracks/text-track.test.js
+++ b/test/unit/tracks/text-track.test.js
@@ -1,39 +1,41 @@
-import TextTrack from '../../../src/js/tracks/text-track.js';
 import window from 'global/window';
+import EventTarget from '../../../src/js/event-target.js';
+import TextTrack from '../../../src/js/tracks/text-track.js';
 import TestHelpers from '../test-helpers.js';
+import log from '../../../src/js/utils/log.js';
+import proxyquireify from 'proxyquireify';
 
-var noop = Function.prototype;
-var defaultTech = {
-  textTracks: noop,
-  on: noop,
-  off: noop,
-  currentTime: noop
+const proxyquire = proxyquireify(require);
+
+const defaultTech = {
+  textTracks() {},
+  on() {},
+  off() {},
+  currentTime() {}
 };
 
 q.module('Text Track');
 
 test('text-track requires a tech', function() {
-  window.throws(function() {
-           new TextTrack();
-         },
-         new Error('A tech was not provided.'),
-         'a tech is required for text track');
+  let error = new Error('A tech was not provided.');
+
+  q.throws(() => new TextTrack(), error, 'a tech is required for text track');
 });
 
 test('can create a TextTrack with various properties', function() {
-  var kind = 'captions',
-      label = 'English',
-      language = 'en',
-      id = '1',
-      mode = 'disabled',
-      tt = new TextTrack({
-        tech: defaultTech,
-        kind: kind,
-        label: label,
-        language: language,
-        id: id,
-        mode: mode
-      });
+  let kind = 'captions';
+  let label = 'English';
+  let language = 'en';
+  let id = '1';
+  let mode = 'disabled';
+  let tt = new TextTrack({
+    kind,
+    label,
+    language,
+    id,
+    mode,
+    tech: defaultTech
+  });
 
   equal(tt.kind, kind, 'we have a kind');
   equal(tt.label, label, 'we have a label');
@@ -43,7 +45,7 @@ test('can create a TextTrack with various properties', function() {
 });
 
 test('defaults when items not provided', function() {
-  var tt = new TextTrack({
+  let tt = new TextTrack({
     tech: defaultTech
   });
 
@@ -54,7 +56,7 @@ test('defaults when items not provided', function() {
 });
 
 test('kind can only be one of several options, defaults to subtitles', function() {
-  var tt = new TextTrack({
+  let tt = new TextTrack({
     tech: defaultTech,
     kind: 'foo'
   });
@@ -99,7 +101,7 @@ test('kind can only be one of several options, defaults to subtitles', function(
 });
 
 test('mode can only be one of several options, defaults to disabled', function() {
-  var tt = new TextTrack({
+  let tt = new TextTrack({
     tech: defaultTech,
     mode: 'foo'
   });
@@ -130,19 +132,19 @@ test('mode can only be one of several options, defaults to disabled', function()
 });
 
 test('kind, label, language, id, cue, and activeCues are read only', function() {
-  var kind = 'captions',
-      label = 'English',
-      language = 'en',
-      id = '1',
-      mode = 'disabled',
-      tt = new TextTrack({
-        tech: defaultTech,
-        kind: kind,
-        label: label,
-        language: language,
-        id: id,
-        mode: mode
-      });
+  let kind = 'captions';
+  let label = 'English';
+  let language = 'en';
+  let id = '1';
+  let mode = 'disabled';
+  let tt = new TextTrack({
+    kind,
+    label,
+    language,
+    id,
+    mode,
+    tech: defaultTech
+  });
 
   tt.kind = 'subtitles';
   tt.label = 'Spanish';
@@ -160,8 +162,8 @@ test('kind, label, language, id, cue, and activeCues are read only', function()
 });
 
 test('mode can only be set to a few options', function() {
-  var tt = new TextTrack({
-    tech: defaultTech,
+  let tt = new TextTrack({
+    tech: defaultTech
   });
 
   tt.mode = 'foo';
@@ -185,8 +187,8 @@ test('mode can only be set to a few options', function() {
 });
 
 test('cues and activeCues return a TextTrackCueList', function() {
-  var tt = new TextTrack({
-    tech: defaultTech,
+  let tt = new TextTrack({
+    tech: defaultTech
   });
 
   ok(tt.cues.getCueById, 'cues are a TextTrackCueList');
@@ -194,14 +196,13 @@ test('cues and activeCues return a TextTrackCueList', function() {
 });
 
 test('cues can be added and removed from a TextTrack', function() {
-  var tt = new TextTrack({
-        tech: defaultTech,
-      }),
-      cues;
+  let tt = new TextTrack({
+    tech: defaultTech
+  });
+  let cues;
 
   cues = tt.cues;
 
-
   equal(cues.length, 0, 'start with zero cues');
 
   tt.addCue({id: '1'});
@@ -220,13 +221,13 @@ test('cues can be added and removed from a TextTrack', function() {
 });
 
 test('fires cuechange when cues become active and inactive', function() {
-  var player = TestHelpers.makePlayer(),
-      changes = 0,
-      cuechangeHandler,
-      tt = new TextTrack({
-        tech: player.tech_,
-        mode: 'showing'
-      });
+  let player = TestHelpers.makePlayer();
+  let changes = 0;
+  let cuechangeHandler;
+  let tt = new TextTrack({
+    tech: player.tech_,
+    mode: 'showing'
+  });
 
   cuechangeHandler = function() {
     changes++;
@@ -259,3 +260,144 @@ test('fires cuechange when cues become active and inactive', function() {
 
   player.dispose();
 });
+
+test('tracks are parsed if vttjs is loaded', function() {
+  const clock = sinon.useFakeTimers();
+  const oldVTT = window.WebVTT;
+  let parserCreated = false;
+
+  window.WebVTT = () => {};
+  window.WebVTT.StringDecoder = () => {};
+  window.WebVTT.Parser = () => {
+    parserCreated = true;
+    return {
+      oncue() {},
+      onparsingerror() {},
+      onflush() {},
+      parse() {},
+      flush() {}
+    };
+  };
+
+  // use proxyquire to stub xhr module because IE8s XDomainRequest usage
+  let xhrHandler;
+  let TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {
+    xhr(options, fn) {
+      xhrHandler  = fn;
+    }
+  });
+
+  let tt = new TextTrack({
+    tech: defaultTech,
+    src: 'http://example.com'
+  });
+
+  xhrHandler(null, {}, 'WEBVTT\n');
+
+  ok(parserCreated, 'WebVTT is loaded, so we can just parse');
+
+  clock.restore();
+  window.WebVTT = oldVTT;
+  TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {});
+});
+
+test('tracks are parsed once vttjs is loaded', function() {
+  const clock = sinon.useFakeTimers();
+  const oldVTT = window.WebVTT;
+  let parserCreated = false;
+
+  // use proxyquire to stub xhr module because IE8s XDomainRequest usage
+  let xhrHandler;
+  let TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {
+    xhr(options, fn) {
+      xhrHandler  = fn;
+    }
+  });
+
+  window.WebVTT = true;
+
+  let testTech = new EventTarget();
+  testTech.textTracks = () => {};
+  testTech.currentTime = () => {};
+
+  let tt = new TextTrack({
+    tech: testTech,
+    src: 'http://example.com'
+  });
+
+  xhrHandler(null, {}, 'WEBVTT\n');
+
+  ok(!parserCreated, 'WebVTT is not loaded, do not try to parse yet');
+
+  clock.tick(100);
+  ok(!parserCreated, 'WebVTT still not loaded, do not try to parse yet');
+
+  window.WebVTT = () => {};
+  window.WebVTT.StringDecoder = () => {};
+  window.WebVTT.Parser = () => {
+    parserCreated = true;
+    return {
+      oncue() {},
+      onparsingerror() {},
+      onflush() {},
+      parse() {},
+      flush() {}
+    };
+  };
+
+  testTech.trigger('vttjsloaded');
+  ok(parserCreated, 'WebVTT is loaded, so we can parse now');
+
+  clock.restore();
+  window.WebVTT = oldVTT;
+  TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {});
+});
+
+test('stops processing if vttjs loading errored out', function() {
+  const clock = sinon.useFakeTimers();
+  const oldVTT = window.WebVTT;
+  let parserCreated = false;
+  window.WebVTT = true;
+
+  // use proxyquire to stub xhr module because IE8s XDomainRequest usage
+  let xhrHandler;
+  let errorMsg;
+  let TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {
+    xhr(options, fn) {
+      xhrHandler  = fn;
+    },
+    '../utils/log.js': {
+      error(msg) {
+        errorMsg = msg;
+      }
+    }
+  });
+
+  let testTech = new EventTarget();
+  testTech.textTracks = () => {};
+  testTech.currentTime = () => {};
+
+  sinon.stub(testTech, 'off');
+  testTech.off.withArgs('vttjsloaded');
+
+  let tt = new TextTrack({
+    tech: testTech,
+    src: 'http://example.com'
+  });
+
+  xhrHandler(null, {}, 'WEBVTT\n');
+
+  ok(!parserCreated, 'WebVTT is not loaded, do not try to parse yet');
+
+  testTech.trigger('vttjserror');
+  let offSpyCall = testTech.off.getCall(0);
+
+  ok(/^vttjs failed to load, stopping trying to process/.test(errorMsg),
+     'vttjs failed to load, so, we logged an error');
+  ok(!parserCreated, 'WebVTT is not loaded, do not try to parse yet');
+  ok(offSpyCall, 'tech.off was called');
+
+  clock.restore();
+  window.WebVTT = oldVTT;
+  TextTrack = proxyquire('../../../src/js/tracks/text-track.js', {});
+});
diff --git a/test/unit/tracks/tracks.test.js b/test/unit/tracks/tracks.test.js
index f64cb33234..baa85808bc 100644
--- a/test/unit/tracks/tracks.test.js
+++ b/test/unit/tracks/tracks.test.js
@@ -1,38 +1,37 @@
 import ChaptersButton from '../../../src/js/control-bar/text-track-controls/chapters-button.js';
+import DescriptionsButton from '../../../src/js/control-bar/text-track-controls/descriptions-button.js';
 import SubtitlesButton from '../../../src/js/control-bar/text-track-controls/subtitles-button.js';
 import CaptionsButton from '../../../src/js/control-bar/text-track-controls/captions-button.js';
 
 import TextTrack from '../../../src/js/tracks/text-track.js';
 import TextTrackDisplay from '../../../src/js/tracks/text-track-display.js';
 import Html5 from '../../../src/js/tech/html5.js';
-import Flash from '../../../src/js/tech/flash.js';
 import Tech from '../../../src/js/tech/tech.js';
 import Component from '../../../src/js/component.js';
 
 import * as browser from '../../../src/js/utils/browser.js';
 import TestHelpers from '../test-helpers.js';
 import document from 'global/document';
-import window from 'global/window';
-import TechFaker from '../tech/tech-faker.js';
 
 q.module('Tracks', {
-  'setup': function() {
+  setup() {
     this.clock = sinon.useFakeTimers();
   },
-  'teardown': function() {
+  teardown() {
     this.clock.restore();
   }
 });
 
 test('should place title list item into ul', function() {
-  var player, chaptersButton;
+  let player;
+  let chaptersButton;
 
   player = TestHelpers.makePlayer();
 
   chaptersButton = new ChaptersButton(player);
 
-  var menuContentElement = chaptersButton.el().getElementsByTagName('UL')[0];
-  var titleElement = menuContentElement.children[0];
+  let menuContentElement = chaptersButton.el().getElementsByTagName('UL')[0];
+  let titleElement = menuContentElement.children[0];
 
   ok(titleElement.innerHTML === 'Chapters', 'title element placed in ul');
 
@@ -40,8 +39,8 @@ test('should place title list item into ul', function() {
 });
 
 test('Player track methods call the tech', function() {
-  var player,
-      calls = 0;
+  let player;
+  let calls = 0;
 
   player = TestHelpers.makePlayer();
 
@@ -61,35 +60,34 @@ test('Player track methods call the tech', function() {
 });
 
 test('TextTrackDisplay initializes tracks on player ready', function() {
-  var calls = 0,
-      ttd = new TextTrackDisplay({
-        on: Function.prototype,
-        addTextTracks: function() {
-          calls--;
-        },
-        getChild: function() {
-          calls--;
-        },
-        ready: function() {
-          calls++;
-        }
-      }, {});
+  let calls = 0;
+  let ttd = new TextTrackDisplay({
+    on() {},
+    addTextTracks() {
+      calls--;
+    },
+    getChild() {
+      calls--;
+    },
+    ready() {
+      calls++;
+    }
+  }, {});
 
   equal(calls, 1, 'only a player.ready call was made');
 });
 
 test('listen to remove and add track events in native text tracks', function() {
-  var oldTestVid = Html5.TEST_VID,
-      player,
-      options,
-      oldTextTracks,
-      events = {},
-      html;
-
-  oldTextTracks = Html5.prototype.textTracks;
+  let oldTestVid = Html5.TEST_VID;
+  let player;
+  let options;
+  let oldTextTracks = Html5.prototype.textTracks;
+  let events = {};
+  let html;
+
   Html5.prototype.textTracks = function() {
     return {
-      addEventListener: function(type, handler) {
+      addEventListener(type, handler) {
         events[type] = true;
       }
     };
@@ -101,17 +99,17 @@ test('listen to remove and add track events in native text tracks', function() {
 
   player = {
     // Function.prototype is a built-in no-op function.
-    controls: Function.prototype,
-    ready: Function.prototype,
-    options: function() {
+    controls() {},
+    ready() {},
+    options() {
       return {};
     },
-    addChild: Function.prototype,
-    id: Function.prototype,
-    el: function() {
+    addChild() {},
+    id() {},
+    el() {
       return {
-        insertBefore: Function.prototype,
-        appendChild: Function.prototype
+        insertBefore() {},
+        appendChild() {}
       };
     }
   };
@@ -120,27 +118,29 @@ test('listen to remove and add track events in native text tracks', function() {
 
   html = new Html5(options);
 
-  ok(events['removetrack'], 'removetrack listener was added');
-  ok(events['addtrack'], 'addtrack listener was added');
+  ok(events.removetrack, 'removetrack listener was added');
+  ok(events.addtrack, 'addtrack listener was added');
 
   Html5.TEST_VID = oldTestVid;
   Html5.prototype.textTracks = oldTextTracks;
 });
 
 test('update texttrack buttons on removetrack or addtrack', function() {
-  var update = 0,
-      i,
-      player,
-      tag,
-      track,
-      oldTextTracks,
-      events = {},
-      oldCaptionsUpdate,
-      oldSubsUpdate,
-      oldChaptersUpdate;
+  let update = 0;
+  let i;
+  let player;
+  let tag;
+  let track;
+  let oldTextTracks;
+  let events = {};
+  let oldCaptionsUpdate;
+  let oldSubsUpdate;
+  let oldChaptersUpdate;
+  let oldDescriptionsUpdate;
 
   oldCaptionsUpdate = CaptionsButton.prototype.update;
   oldSubsUpdate = SubtitlesButton.prototype.update;
+  oldDescriptionsUpdate = DescriptionsButton.prototype.update;
   oldChaptersUpdate = ChaptersButton.prototype.update;
   CaptionsButton.prototype.update = function() {
     update++;
@@ -150,24 +150,28 @@ test('update texttrack buttons on removetrack or addtrack', function() {
     update++;
     oldSubsUpdate.call(this);
   };
+  DescriptionsButton.prototype.update = function() {
+    update++;
+    oldDescriptionsUpdate.call(this);
+  };
   ChaptersButton.prototype.update = function() {
     update++;
     oldChaptersUpdate.call(this);
   };
 
-  Tech.prototype['featuresNativeTextTracks'] = true;
+  Tech.prototype.featuresNativeTextTracks = true;
   oldTextTracks = Tech.prototype.textTracks;
   Tech.prototype.textTracks = function() {
     return {
       length: 0,
-      addEventListener: function(type, handler) {
+      addEventListener(type, handler) {
         if (!events[type]) {
           events[type] = [];
         }
         events[type].push(handler);
       },
       // Requrired in player.dispose()
-      removeEventListener: function(){}
+      removeEventListener() {}
     };
   };
 
@@ -185,26 +189,26 @@ test('update texttrack buttons on removetrack or addtrack', function() {
   track.src = '#es.vtt';
   tag.appendChild(track);
 
-  player =  TestHelpers.makePlayer({}, tag);
+  player = TestHelpers.makePlayer({}, tag);
 
   player.player_ = player;
 
-  equal(update, 3, 'update was called on the three buttons during init');
+  equal(update, 4, 'update was called on the four buttons during init');
 
-  for (i = 0; i < events['removetrack'].length; i++) {
-    events['removetrack'][i]();
+  for (i = 0; i < events.removetrack.length; i++) {
+    events.removetrack[i]();
   }
 
-  equal(update, 6, 'update was called on the three buttons for remove track');
+  equal(update, 8, 'update was called on the four buttons for remove track');
 
-  for (i = 0; i < events['addtrack'].length; i++) {
-    events['addtrack'][i]();
+  for (i = 0; i < events.addtrack.length; i++) {
+    events.addtrack[i]();
   }
 
-  equal(update, 9, 'update was called on the three buttons for remove track');
+  equal(update, 12, 'update was called on the four buttons for remove track');
 
   Tech.prototype.textTracks = oldTextTracks;
-  Tech.prototype['featuresNativeTextTracks'] = false;
+  Tech.prototype.featuresNativeTextTracks = false;
   CaptionsButton.prototype.update = oldCaptionsUpdate;
   SubtitlesButton.prototype.update = oldSubsUpdate;
   ChaptersButton.prototype.update = oldChaptersUpdate;
@@ -213,15 +217,13 @@ test('update texttrack buttons on removetrack or addtrack', function() {
 });
 
 test('if native text tracks are not supported, create a texttrackdisplay', function() {
-  var oldTestVid = Html5.TEST_VID,
-      oldIsFirefox = browser.IS_FIREFOX,
-      oldTextTrackDisplay = Component.getComponent('TextTrackDisplay'),
-      called = false,
-      player,
-      tag,
-      track,
-      options,
-      html;
+  let oldTestVid = Html5.TEST_VID;
+  let oldIsFirefox = browser.IS_FIREFOX;
+  let oldTextTrackDisplay = Component.getComponent('TextTrackDisplay');
+  let called = false;
+  let player;
+  let tag;
+  let track;
 
   tag = document.createElement('video');
   track = document.createElement('track');
@@ -258,7 +260,7 @@ test('if native text tracks are not supported, create a texttrackdisplay', funct
 });
 
 test('html5 tech supports native text tracks if the video supports it, unless mode is a number', function() {
-  var oldTestVid = Html5.TEST_VID;
+  let oldTestVid = Html5.TEST_VID;
 
   Html5.TEST_VID = {
     textTracks: [{
@@ -272,8 +274,8 @@ test('html5 tech supports native text tracks if the video supports it, unless mo
 });
 
 test('html5 tech supports native text tracks if the video supports it, unless it is firefox', function() {
-  var oldTestVid = Html5.TEST_VID,
-      oldIsFirefox = browser.IS_FIREFOX;
+  let oldTestVid = Html5.TEST_VID;
+  let oldIsFirefox = browser.IS_FIREFOX;
 
   Html5.TEST_VID = {
     textTracks: []
@@ -308,6 +310,7 @@ if (Html5.supportsNativeTextTracks()) {
     let tt = el.textTracks;
     let emulatedTt = html.textTracks();
     let track = document.createElement('track');
+
     el.appendChild(track);
 
     let addtrack = function() {
@@ -317,6 +320,7 @@ if (Html5.supportsNativeTextTracks()) {
       emulatedTt.off('addtrack', addtrack);
       el.removeChild(track);
     };
+
     emulatedTt.on('addtrack', addtrack);
     emulatedTt.on('removetrack', function() {
       equal(emulatedTt.length, tt.length, 'we have matching tracks length');
@@ -333,6 +337,7 @@ if (Html5.supportsNativeTextTracks()) {
     let tt = el.textTracks;
     let emulatedTt = html.textTracks();
     let track = document.createElement('track');
+
     el.appendChild(track);
 
     let addtrack = function() {
@@ -347,6 +352,7 @@ if (Html5.supportsNativeTextTracks()) {
 
       done();
     };
+
     emulatedTt.on('addtrack', addtrack);
   });
 }
@@ -354,6 +360,7 @@ if (Html5.supportsNativeTextTracks()) {
 test('should check for text track changes when emulating text tracks', function() {
   let tech = new Tech();
   let numTextTrackChanges = 0;
+
   tech.on('texttrackchange', function() {
     numTextTrackChanges++;
   });
@@ -367,6 +374,7 @@ test('removes cuechange event when text track is hidden for emulated tracks', fu
     tech: player.tech_,
     mode: 'showing'
   });
+
   tt.addCue({
     id: '1',
     startTime: 2,
@@ -376,6 +384,7 @@ test('removes cuechange event when text track is hidden for emulated tracks', fu
   player.tech_.emulateTextTracks();
 
   let numTextTrackChanges = 0;
+
   player.tech_.on('texttrackchange', function() {
     numTextTrackChanges++;
   });
@@ -406,19 +415,18 @@ test('removes cuechange event when text track is hidden for emulated tracks', fu
     'texttrackchange should be not be called since mode is hidden');
 });
 
-test('should return correct remote text track values', function () {
+test('should return correct remote text track values', function() {
   let fixture = document.getElementById('qunit-fixture');
-
-  let html = '<video id="example_1" class="video-js" autoplay preload="none">';
-      html += '<source src="http://google.com" type="video/mp4">';
-      html += '<source src="http://google.com" type="video/webm">';
-      html += '<track kind="captions" label="label">';
-      html += '</video>';
+  let html = `
+    <video id="example_1" class="video-js" autoplay preload="none">
+      <source src="http://google.com" type="video/mp4">
+      <source src="http://google.com" type="video/webm">
+      <track kind="captions" label="label">
+    </video>
+  `;
 
   fixture.innerHTML += html;
-
   let tag = document.getElementById('example_1');
-
   let player = TestHelpers.makePlayer({}, tag);
 
   this.clock.tick(1);
@@ -442,9 +450,8 @@ test('should return correct remote text track values', function () {
   player.dispose();
 });
 
-test('should uniformly create html track element when adding text track', function () {
+test('should uniformly create html track element when adding text track', function() {
   let player = TestHelpers.makePlayer();
-
   let track = {
     kind: 'kind',
     src: 'src',
@@ -468,3 +475,81 @@ test('should uniformly create html track element when adding text track', functi
 
   player.dispose();
 });
+
+test('default text tracks should show by default', function() {
+  let tag = TestHelpers.makeTag();
+  let capt = document.createElement('track');
+
+  capt.setAttribute('kind', 'captions');
+  capt.setAttribute('default', 'default');
+
+  tag.appendChild(capt);
+
+  let player = TestHelpers.makePlayer({
+    html5: {
+      nativeTextTracks: false
+    }
+  }, tag);
+
+  // native tracks are initialized after the player is ready
+  this.clock.tick(1);
+
+  let tracks = player.textTracks();
+
+  equal(tracks[0].kind, 'captions', 'the captions track is present');
+  equal(tracks[0].mode, 'showing', 'the captions track is showing');
+});
+
+test('default captions take precedence over default descriptions', function() {
+  let tag = TestHelpers.makeTag();
+  let desc = document.createElement('track');
+  let capt = document.createElement('track');
+
+  desc.setAttribute('kind', 'descriptions');
+  desc.setAttribute('default', 'default');
+  capt.setAttribute('kind', 'captions');
+  capt.setAttribute('default', 'default');
+
+  tag.appendChild(desc);
+  tag.appendChild(capt);
+
+  let player = TestHelpers.makePlayer({
+    html5: {
+      nativeTextTracks: false
+    }
+  }, tag);
+
+  // native tracks are initialized after the player is ready
+  this.clock.tick(1);
+
+  let tracks = player.textTracks();
+
+  equal(tracks[0].kind, 'descriptions', 'the descriptions track is first');
+  equal(tracks[0].mode, 'disabled', 'the descriptions track is disabled');
+  equal(tracks[1].kind, 'captions', 'the captions track is second');
+  equal(tracks[1].mode, 'showing', 'the captions track is showing');
+});
+
+test('removeRemoteTextTrack should be able to take both a track and the response from addRemoteTextTrack', function() {
+  let player = TestHelpers.makePlayer();
+  let track = {
+    kind: 'kind',
+    src: 'src',
+    language: 'language',
+    label: 'label',
+    default: 'default'
+  };
+  let htmlTrackElement = player.addRemoteTextTrack(track);
+
+  equal(player.remoteTextTrackEls().length, 1, 'html track element exist');
+
+  player.removeRemoteTextTrack(htmlTrackElement);
+
+  equal(player.remoteTextTrackEls().length, 0, 'the track element was removed correctly');
+
+  htmlTrackElement = player.addRemoteTextTrack(track);
+  equal(player.remoteTextTrackEls().length, 1, 'html track element exist');
+
+  player.removeRemoteTextTrack(htmlTrackElement.track);
+  equal(player.remoteTextTrackEls().length, 0, 'the track element was removed correctly');
+});