Updates for videojs/video.js#1093

I made the updates I mentioned in videojs/video.js#1093. If you want to pull them we can merge the pull request on core.

Cheers,
-heff