Build: Merge branch 'master' of https://github.com/videojs/video.js

generated from commit 2739185c0b7265a4b3aadc06ee687adcca5091fc